From: Weblate <noreply@weblate.org>
Date: Mon, 6 Jul 2015 21:54:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~54
X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/2b7fd594eb127b5a7e01e664ed54a5fa0be860c2?ds=sidebyside;hp=--cc

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

2b7fd594eb127b5a7e01e664ed54a5fa0be860c2