From: Weblate Date: Tue, 22 Mar 2016 09:10:50 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.2.0~36 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/84a4575bf1b0c6709f71b3c5a862c17d21747569?ds=sidebyside;hp=84a4575bf1b0c6709f71b3c5a862c17d21747569 Merge remote-tracking branch 'origin/master' ---