From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 18 Jan 2011 13:28:05 +0000 (+0300)
Subject: Merge branch 'master' of fakecake.org:public_html/testbox/tt-rss
X-Git-Tag: 1.5.1~4
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=8122dae505d4115773f348b973a7ea2ec360e2b6;p=tt-rss.git

Merge branch 'master' of fakecake.org:public_html/testbox/tt-rss
---

8122dae505d4115773f348b973a7ea2ec360e2b6