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

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

15c1a04d103ae4d36c68831932a27acfdee6eb5c