From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 25 Mar 2013 08:23:20 +0000 (+0400)
Subject: Merge branch 'master' of git://github.com/skikuta/Tiny-Tiny-RSS into skikuta-master
X-Git-Tag: 1.7.6~312
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=28425ec7028321bef5de72956c82bcd66d2b16ad;p=tt-rss.git

Merge branch 'master' of git://github.com/skikuta/Tiny-Tiny-RSS into skikuta-master

Conflicts:
	locale/ja_JP/LC_MESSAGES/messages.po
---

28425ec7028321bef5de72956c82bcd66d2b16ad