From: Emilie <zawadzki@ircam.fr>
Date: Wed, 15 Feb 2017 16:09:24 +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=cc311e7b3c5000d3bd54761aa95dcadd85a50e30;p=mezzo.git

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

cc311e7b3c5000d3bd54761aa95dcadd85a50e30