From: Weblate <noreply@weblate.org>
Date: Thu, 5 Nov 2015 22:16:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~7
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/afbc9af82d3808d70d7d34c5908059838298ef2a?hp=--cc

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

afbc9af82d3808d70d7d34c5908059838298ef2a