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

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

3cc02a5b886a4e51ddc12d93b97c84a144d1521e