From: Andrew Dolgov <fox@fakecake.org>
Date: Sat, 13 Nov 2010 22:42:34 +0000 (+0300)
Subject: Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss
X-Git-Tag: 1.5.0~230
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a320475200cda5feb7e479bd26c58cd8803e6c64;p=tt-rss.git

Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss
---

a320475200cda5feb7e479bd26c58cd8803e6c64