From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 15 Mar 2017 11:49:22 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6462fd54c8b497dc897a843f2c229d6fdc9e22ab;p=mezzo.git

Merge branch 'dev'
---

6462fd54c8b497dc897a843f2c229d6fdc9e22ab