From: Art4 <art4@wlabs.de>
Date: Thu, 19 Feb 2015 22:17:43 +0000 (+0100)
Subject: Merge branch 'master' into patch-1
X-Git-Tag: 16.3~360^2~1
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d9c042c4c536f1afbf206aeea09b0b127b7b6418;p=tt-rss.git

Merge branch 'master' into patch-1

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

d9c042c4c536f1afbf206aeea09b0b127b7b6418