From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 11 Jul 2015 22:29:50 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 16.3~232^2~18
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1727ceabca4e1d71cb5412946fcd94c3e3ea6196;p=tt-rss.git

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

1727ceabca4e1d71cb5412946fcd94c3e3ea6196