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

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

05809dfdf7cbf7699be6408c0f49d325585726b5