From: Heiko Adams <h.adams@heiko-adams.de>
Date: Fri, 19 Aug 2016 15:25:05 +0000 (+0200)
Subject: Merge branch 'master' into german-translation
X-Git-Tag: 17.1~47^2~1
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=2842cf6e4563d1665741dd4c151798e6e282c60b

Merge branch 'master' into german-translation
---

2842cf6e4563d1665741dd4c151798e6e282c60b