From: Weblate Date: Tue, 29 Sep 2015 14:54:36 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.1~14 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/a55d668186a73f8dcf98b40e3c22f443c4cd104b?hp=a55d668186a73f8dcf98b40e3c22f443c4cd104b Merge remote-tracking branch 'origin/master' ---