From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2016 06:39:29 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 16.3~26
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d43b6563efac4d1c96e9a9751802fcef318318eb;p=tt-rss.git

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

d43b6563efac4d1c96e9a9751802fcef318318eb