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

Merge branch 'dev'
---

893a7a69dd059d10723d101ad33c610709589592