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

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

079db9eec02f1002e3bca2ae8e0a890cc1dd138e