From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 12 Aug 2015 17:36:59 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 16.3~140
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1707a768ea736c0c5568e45b47b60714579d64a9;p=tt-rss.git

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

1707a768ea736c0c5568e45b47b60714579d64a9