From: Weblate Date: Mon, 12 Oct 2015 17:20:59 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.1~8 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/85cfef4c98b0e8157d91ce1693a8a09c321721e2?hp=85cfef4c98b0e8157d91ce1693a8a09c321721e2 Merge remote-tracking branch 'origin/master' ---