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

Merge branch 'dev'
---

6676bca792ef7d145ce09fa8fe3e579ad6f4974f