From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 11 Sep 2012 19:13:15 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.6.0~49^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ef645ff05e483a56dca9ed46a80e27033aa1a46e;p=tt-rss.git

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

ef645ff05e483a56dca9ed46a80e27033aa1a46e