From: Lorenzo Cameroni <lorenzo.cameroni@gmail.com>
Date: Thu, 5 Mar 2015 20:21:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 16.3~348^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=21fcaf979fffd9a8cd11c8a5f6e63b1e64c783d1;p=tt-rss.git

Merge remote-tracking branch 'origin/master'
---

21fcaf979fffd9a8cd11c8a5f6e63b1e64c783d1