From: Weblate Date: Tue, 5 Jan 2016 19:13:43 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.2.0~42 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/f30e3ab884a76643876736135466adb33f18063e?ds=inline Merge remote-tracking branch 'origin/master' --- f30e3ab884a76643876736135466adb33f18063e