]> git.wh0rd.org Git - tt-rss.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorLorenzo Cameroni <lorenzo.cameroni@gmail.com>
Thu, 5 Mar 2015 20:21:02 +0000 (21:21 +0100)
committerLorenzo Cameroni <lorenzo.cameroni@gmail.com>
Thu, 5 Mar 2015 20:21:02 +0000 (21:21 +0100)

Trivial merge