From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 22 Feb 2017 14:13:42 +0000 (+0100)
Subject: Merge branch 'patch-3' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0a3bc1b59b47736c276e32b6f210db02d79661de;p=mezzo.git

Merge branch 'patch-3' into dev

Conflicts:
	app/locale/fr/LC_MESSAGES/django.po
---

0a3bc1b59b47736c276e32b6f210db02d79661de