From: Weblate Date: Tue, 5 Jan 2016 21:36:12 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.2.0~41 X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/ef30b3c2fb334270a14593e44cfe5b49ef238122?hp=ef30b3c2fb334270a14593e44cfe5b49ef238122 Merge remote-tracking branch 'origin/master' ---