From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 25 May 2013 05:36:42 +0000 (+0400)
Subject: Merge branch 'master' of git://github.com/EyesX/Tiny-Tiny-RSS into EyesX-master
X-Git-Tag: 1.8~65
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=33945d7517d32a1a515e8123152dffed5651020c;p=tt-rss.git

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

Conflicts:
	locale/sv_SE/LC_MESSAGES/messages.mo
	locale/sv_SE/LC_MESSAGES/messages.po
---

33945d7517d32a1a515e8123152dffed5651020c