From: Emilie <zawadzki@ircam.fr>
Date: Tue, 14 Feb 2017 10:22:49 +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=bbb66b8e1024aafd9a67a2f4c17b347d4368d308;p=mezzo.git

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

bbb66b8e1024aafd9a67a2f4c17b347d4368d308