From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 7 Dec 2015 17:07:37 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 16.3~70
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6eed9a7463443d206bb9f9369b77be70ac84d9de;p=tt-rss.git

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

6eed9a7463443d206bb9f9369b77be70ac84d9de