From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 3 Mar 2016 13:10:11 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1f2ad4318720a46222e07d37a6c147be8a76ed4f;p=mezzo.git

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

1f2ad4318720a46222e07d37a6c147be8a76ed4f