From: Weblate Date: Fri, 13 Jan 2017 18:34:55 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 3.2.0~33 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/6c49d9981c96cdd5d931cbd1eeb5cc584c1370ab?hp=6c49d9981c96cdd5d931cbd1eeb5cc584c1370ab Merge remote-tracking branch 'origin/master' ---