From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 14 Feb 2017 15:49:11 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 17.4~26
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=c8919d630e4e4c9bc663f5db95fd01e17d09f7f4

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

c8919d630e4e4c9bc663f5db95fd01e17d09f7f4