From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 11 Apr 2016 09:01:16 +0000 (+0200)
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=0a39ff90db61063999592f2b2164595c77c7b65b;p=mezzo.git

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

0a39ff90db61063999592f2b2164595c77c7b65b