From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 15 Mar 2013 05:25:08 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.7.3~6
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=5a1b1af31178736db2b264e88b6128861d1d57af;p=tt-rss.git

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

5a1b1af31178736db2b264e88b6128861d1d57af