From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 25 Nov 2014 10:48:07 +0000 (+0300)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.15~10
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=2c30a62e77688da34b7ce30832524e3a61af3508

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

2c30a62e77688da34b7ce30832524e3a61af3508