From: Barak Korren <barak.korren@gmail.com>
Date: Tue, 2 Apr 2013 17:38:07 +0000 (+0300)
Subject: Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git
X-Git-Tag: 1.7.6~5^2~1
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=58a2577d48790c79adfd44bcfd662c980ce6cfe4;p=tt-rss.git

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

58a2577d48790c79adfd44bcfd662c980ce6cfe4