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