From: Weblate <noreply@weblate.org>
Date: Fri, 26 Aug 2016 21:29:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.2.0~23
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/1fe78102806121e5b8006a07147c1a6a9034715e?ds=inline;hp=--cc

Merge remote-tracking branch 'origin/master'
---

1fe78102806121e5b8006a07147c1a6a9034715e