From: Emilie <zawadzki@ircam.fr>
Date: Tue, 14 Mar 2017 15:34:13 +0000 (+0100)
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=eaabfddc5302cb51dd427a40aa33ea9cd790165e;p=mezzo.git

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

eaabfddc5302cb51dd427a40aa33ea9cd790165e