From: Weblate <noreply@weblate.org>
Date: Mon, 5 Oct 2015 11:46:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~12
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/682d291ea80c3a43b0cbdcb210dfb12261cbf33b?ds=sidebyside;hp=-c

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

682d291ea80c3a43b0cbdcb210dfb12261cbf33b