From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 4 May 2013 08:02:08 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.7.9~25^2~14
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2a3e8d7f3449c372d79ec525c251e0eeb791e170;p=tt-rss.git

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

2a3e8d7f3449c372d79ec525c251e0eeb791e170