From: Perry Werneck <perry.werneck@gmail.com>
Date: Sun, 11 Aug 2013 13:41:50 +0000 (-0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 1.10~25^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f0feea33ce757f1f1913de0aff8a3cebdd287e7c;p=tt-rss.git

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

f0feea33ce757f1f1913de0aff8a3cebdd287e7c