From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 2 Sep 2012 09:46:05 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.6.0~85
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d7f9e4fc0859c6f05f2b2e255ff9059f40691564;p=tt-rss.git

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

d7f9e4fc0859c6f05f2b2e255ff9059f40691564