From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 9 Nov 2016 14:29:17 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3d2729f2c9f8a66636eca090de3bdc68c6bf0fc5;p=mezzo.git

Merge branch 'dev'
---

3d2729f2c9f8a66636eca090de3bdc68c6bf0fc5