]> git.wh0rd.org Git - tt-rss.git/commitdiff
Merge branch 'master' of fakecake.org:public_html/testbox/tt-rss
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Tue, 18 Jan 2011 13:28:05 +0000 (16:28 +0300)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Tue, 18 Jan 2011 13:28:05 +0000 (16:28 +0300)

Trivial merge