From: Thomas Renard <cybaer42@web.de>
Date: Thu, 27 Dec 2012 18:18:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into owncloud
X-Git-Tag: 1.7.0~90^2~2^2~3
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=04d05dcc3f5d95ac1ba201820a4d10812b8068e7;p=tt-rss.git

Merge remote-tracking branch 'upstream/master' into owncloud
---

04d05dcc3f5d95ac1ba201820a4d10812b8068e7