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

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

7c97d17aaf373339a8bcd917ad59ca6018148f0d