From: Richard Beales <rich@richbeales.net>
Date: Tue, 19 Mar 2013 19:20:14 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 1.7.5~29^2~7
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=598a8f37a2ce94186166d1c3b22cc65efdebe4a4;hp=-c;p=tt-rss.git

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

598a8f37a2ce94186166d1c3b22cc65efdebe4a4