From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 8 Mar 2017 17:34:41 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=86424e1f0140e7887f2d2c046c66607289c89ce1;p=mezzo.git

Merge branch 'dev'
---

86424e1f0140e7887f2d2c046c66607289c89ce1