From: Weblate Date: Thu, 18 Feb 2016 15:26:01 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.2.0~40 X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/1d8d8c5aebcf4879b93b9b3b7ece006a359aec01?ds=sidebyside;hp=1d8d8c5aebcf4879b93b9b3b7ece006a359aec01 Merge remote-tracking branch 'origin/master' ---