From: Weblate Date: Thu, 19 Jan 2017 19:36:45 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 3.2.0~30 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/8f0c2200cade5e8de81962f71fdaba3457e551f5?hp=8f0c2200cade5e8de81962f71fdaba3457e551f5 Merge remote-tracking branch 'origin/master' ---