From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 23 Aug 2012 09:03:52 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.6.0~126
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=3bdc2b999b7e89815052ee97e6f530da6111c22a;p=tt-rss.git

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

3bdc2b999b7e89815052ee97e6f530da6111c22a