From: Emilie <zawadzki@ircam.fr>
Date: Wed, 22 Mar 2017 10:29:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'vertigo/master' into merging-vertigo
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c025ece8123024383552af5163cd00ef9d6fcd42;p=mezzo.git

Merge remote-tracking branch 'vertigo/master' into merging-vertigo
---

c025ece8123024383552af5163cd00ef9d6fcd42