From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 15 May 2013 05:22:29 +0000 (+0400)
Subject: Merge branch 'master' of git://github.com/falu/Tiny-Tiny-RSS into falu-master
X-Git-Tag: 1.8~119
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=52af297e745f5b5c101c642c45e08d268aa324d8

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

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

52af297e745f5b5c101c642c45e08d268aa324d8