From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 24 Oct 2016 20:38:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'gitlab/patch-6' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=119d38006d6ea00c961a264086e68d6d74795909;p=mezzo.git

Merge remote-tracking branch 'gitlab/patch-6' into dev
---

119d38006d6ea00c961a264086e68d6d74795909