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

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

9ff0b17cb27316a2e59ddbd22fc242142f35d973