From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 11 Dec 2011 18:58:25 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.5.8~31
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c902b6442d495f0d7273f9404e5ffb5318f5fa64;p=tt-rss.git

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

c902b6442d495f0d7273f9404e5ffb5318f5fa64