From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 28 Dec 2012 05:39:35 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.7.0~90
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=43e706238a78633edb684c2e3b08260b1a91b149

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

43e706238a78633edb684c2e3b08260b1a91b149