From: Weblate Date: Fri, 13 Nov 2015 20:48:04 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.1~6 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/c4e741fcf19f57e832f239f56b3829f9e15e8ec0 Merge remote-tracking branch 'origin/master' --- c4e741fcf19f57e832f239f56b3829f9e15e8ec0