From: Weblate <noreply@weblate.org>
Date: Fri, 26 Aug 2016 21:08:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.2.0~25
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/d0cd7964b1b67033d2350994b8eb4dea324838cd

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

d0cd7964b1b67033d2350994b8eb4dea324838cd