From: Emilie <zawadzki@ircam.fr>
Date: Thu, 16 Mar 2017 14:27:28 +0000 (+0800)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6e1c1eb72adc3932f4a3db68231d4c99bfbe64d8;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
---

6e1c1eb72adc3932f4a3db68231d4c99bfbe64d8