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

Merge branch 'dev'
---

34b6f67b39dd26a49abf11fb791b1420370c0123