From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 6 Jul 2015 18:31:57 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 16.3~256
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=74c1ff6065a4fc7c58bb453a87dfcf59a14e88f8;p=tt-rss.git

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

74c1ff6065a4fc7c58bb453a87dfcf59a14e88f8