From: Weblate Date: Mon, 6 Jul 2015 22:11:14 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.1~53 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/2590706e0001e6df17d4252e9dc22e3d9e3c5614?hp=2590706e0001e6df17d4252e9dc22e3d9e3c5614 Merge remote-tracking branch 'origin/master' ---