From: Weblate <noreply@weblate.org>
Date: Wed, 2 Sep 2015 08:22:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~18
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/fd5335f8de2f2f25851139dce45ea4030025960c?hp=fd5335f8de2f2f25851139dce45ea4030025960c

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