From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 12 Aug 2015 20:08:47 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 16.3~135^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2b925f3216d541e62a139bb28114f2479afabd93;p=tt-rss.git

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

2b925f3216d541e62a139bb28114f2479afabd93