From: Weblate Date: Fri, 13 Jan 2017 17:24:42 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 3.2.0~38 X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/145ca7860e1b2c33b6a92efe606a1b75b20a9cb3?hp=145ca7860e1b2c33b6a92efe606a1b75b20a9cb3 Merge remote-tracking branch 'origin/master' ---