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

Merge branch 'dev'
---

cabe205211439f0769962376a32bbc53b5b4c894