From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 6 Jul 2015 09:10:31 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 16.3~256^2~1
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6affdc59a31e41c9142c6e2ed8191564a4cbd79b;p=tt-rss.git

Merge branch 'master' of git.fakecake.org:tt-rss
---

6affdc59a31e41c9142c6e2ed8191564a4cbd79b