From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 8 Jul 2015 07:35:29 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 16.3~241
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=25c747f5767a0588d2079b036fa89873067f924f;p=tt-rss.git

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

25c747f5767a0588d2079b036fa89873067f924f