From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Apr 2011 07:52:30 +0000 (+0400)
Subject: Merge branch 'master' into shared-feedbrowser
X-Git-Tag: 1.5.3~15^2~11
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=34846e514f916e0ae7d942cc99e84c9507e4728b

Merge branch 'master' into shared-feedbrowser
---

34846e514f916e0ae7d942cc99e84c9507e4728b