From: justauser <justausr@hotmail.com>
Date: Wed, 29 May 2013 11:52:20 +0000 (-0400)
Subject: Merge branch 'master' into jremote
X-Git-Tag: 1.8~47^2~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7aab5617b689701cd9b6210132ed4e9dd55d3941;p=tt-rss.git

Merge branch 'master' into jremote

latest master checkins
---

7aab5617b689701cd9b6210132ed4e9dd55d3941