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

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

04ed8b423abd9046ac4ee6813cf5e98b37aad2a3