From: Heiko Adams Date: Mon, 30 Nov 2015 09:29:44 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into german-translation X-Git-Tag: 16.3~88^2~2 X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=05761788b7b5a8a7e6c14333669acd0793886223 Merge remote-tracking branch 'origin/master' into german-translation --- 05761788b7b5a8a7e6c14333669acd0793886223