]> git.wh0rd.org Git - tt-rss.git/commitdiff
Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss
authorAndrew Dolgov <fox@fakecake.org>
Sat, 13 Nov 2010 22:42:34 +0000 (01:42 +0300)
committerAndrew Dolgov <fox@fakecake.org>
Sat, 13 Nov 2010 22:42:34 +0000 (01:42 +0300)

Trivial merge