]> git.wh0rd.org - tt-rss.git/commitdiff
Merge branch 'master' of https://tt-rss.org/git/tt-rss
authordedioste <dedioste@gmail.com>
Sun, 26 Jul 2015 12:44:16 +0000 (14:44 +0200)
committerdedioste <dedioste@gmail.com>
Sun, 26 Jul 2015 12:44:16 +0000 (14:44 +0200)

Trivial merge