From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 7 Nov 2010 15:18:27 +0000 (+0300)
Subject: Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss
X-Git-Tag: 1.5.0~380
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=74ed2e858d72849ef84e4e19cd01a4b00c1d471c;p=tt-rss.git

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

74ed2e858d72849ef84e4e19cd01a4b00c1d471c