From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 2 Apr 2013 12:55:13 +0000 (+0400)
Subject: Merge branch 'master' of git://github.com/HeikoAdams/Tiny-Tiny-RSS into HeikoAdams... 
X-Git-Tag: 1.7.6~14
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2bf5783f81c3825be2c1d3ad26b6d8d7560cdfcb;p=tt-rss.git

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

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

2bf5783f81c3825be2c1d3ad26b6d8d7560cdfcb