From: Emilie <zawadzki@ircam.fr>
Date: Tue, 21 Feb 2017 16:12:48 +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=25a6e2280c7f9f82b0713da6ed72c4e99b3b2bf6;p=mezzo.git

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

25a6e2280c7f9f82b0713da6ed72c4e99b3b2bf6