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

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

98d684f99ba839ff1514675f2786f0f851e5cbf6