From: Weblate <noreply@weblate.org>
Date: Sat, 14 Nov 2015 09:31:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~4
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/5545d874624b35a364e26e140a9538450ed6709f?ds=sidebyside;hp=5545d874624b35a364e26e140a9538450ed6709f

Merge remote-tracking branch 'origin/master'
---