From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 1 Aug 2016 05:26:35 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 16.8~11
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e97e2ec9f3ca5468490ca333c08f33b232ffbbb2;p=tt-rss.git

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

e97e2ec9f3ca5468490ca333c08f33b232ffbbb2