From: Weblate <noreply@weblate.org>
Date: Wed, 2 Sep 2015 08:26:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~17
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/fa9dce5c9e20c6dafbda6028764478623d84096e?ds=sidebyside;hp=--cc

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

fa9dce5c9e20c6dafbda6028764478623d84096e