From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 7 Nov 2016 19:15:26 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=971e270b8de39fc57753093ca1628f06c1dcceea;p=mezzo.git

Merge branch 'dev'
---

971e270b8de39fc57753093ca1628f06c1dcceea