From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 11 Jul 2013 10:15:32 +0000 (+0400)
Subject: Merge branch 'master' of git://github.com/syrnon/Tiny-Tiny-RSS into syrnon-master
X-Git-Tag: 1.9~44
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=940e29a63789111c813d5c2d88c0e30071b113f0;p=tt-rss.git

Merge branch 'master' of git://github.com/syrnon/Tiny-Tiny-RSS into syrnon-master
---

940e29a63789111c813d5c2d88c0e30071b113f0