From: Weblate Date: Fri, 26 Jun 2015 06:53:01 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.1~57 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/4fbf23fef5657575b1247b333a911778b445a6ab?ds=inline;hp=4fbf23fef5657575b1247b333a911778b445a6ab Merge remote-tracking branch 'origin/master' ---