From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 17 Aug 2015 04:55:44 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 16.3~129
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=961cae85a4ed14647c3b4a616c3c63873c7bc5e0;p=tt-rss.git

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

961cae85a4ed14647c3b4a616c3c63873c7bc5e0