From: Weblate <noreply@weblate.org>
Date: Fri, 13 Nov 2015 20:58:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~5
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/3faa18e434ca9e4fa675d31e817d403016b6445a?hp=--cc

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

3faa18e434ca9e4fa675d31e817d403016b6445a