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

Merge branch 'dev'
---

a913196ad9723c896ad7f915483bf2973bf9cbb1