From: justauser <justausr@hotmail.com>
Date: Tue, 28 May 2013 15:39:58 +0000 (-0400)
Subject: Merge branch 'master' into jremote
X-Git-Tag: 1.8~47^2~3
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=991418fa566ff462d9616123168c5f7f839cdc15;p=tt-rss.git

Merge branch 'master' into jremote

update working to master
---

991418fa566ff462d9616123168c5f7f839cdc15