From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 8 Nov 2016 15:21:44 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6de8f2107b20432fd2e01c77f67c89cc64a9bde7;p=mezzo.git

Merge branch 'dev'
---

6de8f2107b20432fd2e01c77f67c89cc64a9bde7