From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 06:20:45 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.7.9~25^2~180
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4a535e2d31a276b37ba69dfa911d84f7c04ae6c7;p=tt-rss.git

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
---

4a535e2d31a276b37ba69dfa911d84f7c04ae6c7