From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 22 Jan 2017 07:19:11 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 17.1~4
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4441fc6f3b5d2ae0df5c0a8797317c632b1d4d23;p=tt-rss.git

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

4441fc6f3b5d2ae0df5c0a8797317c632b1d4d23