From: Weblate <noreply@weblate.org>
Date: Fri, 13 Jan 2017 17:56:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.2.0~34
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/078a50aeed0f055af710b51bc71f109d8ffc1318

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

078a50aeed0f055af710b51bc71f109d8ffc1318