From: Weblate <noreply@weblate.org>
Date: Wed, 2 Sep 2015 12:05:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~15
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/a8cb2b83429c0f5b75f95f639cf8987f2a3c3608?hp=--cc

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

a8cb2b83429c0f5b75f95f639cf8987f2a3c3608