From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 29 Nov 2014 17:35:16 +0000 (+0300)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.15~7
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=3ba0599de7646fc022c6c8b3687da762feabe817

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

3ba0599de7646fc022c6c8b3687da762feabe817