From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 23 Jun 2015 01:35:37 +0000 (-0700)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 16.3~271
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=241026d427631785b9a8dc9954dc6be16817c153;p=tt-rss.git

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

241026d427631785b9a8dc9954dc6be16817c153