From: Robert Wetzlmayr <r.wetzlmayr@gmail.com>
Date: Wed, 19 Nov 2014 17:15:42 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.15~10^2^2
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=aa1274411eae064b802186d7f734db401f29c205

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

aa1274411eae064b802186d7f734db401f29c205