From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 29 Apr 2013 19:15:34 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.7.9~25^2~55
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d3321170582af40276c48c70af18372c93b01311;p=tt-rss.git

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

d3321170582af40276c48c70af18372c93b01311