From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 18 Oct 2010 14:32:57 +0000 (+0400)
Subject: Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss
X-Git-Tag: 1.5.0~435
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9c57be20a28074bc13e924931106f2543ca478b5;p=tt-rss.git

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

9c57be20a28074bc13e924931106f2543ca478b5