From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 3 Oct 2010 07:54:20 +0000 (+0400)
Subject: Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss
X-Git-Tag: 1.5.0~438
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=3b3a199df86b1c94d16e6c0f601e3988df37070f;p=tt-rss.git

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

3b3a199df86b1c94d16e6c0f601e3988df37070f