From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 7 Apr 2016 14:47:28 +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=33c1ab5ac05868be2f7a02cfae4332dc4025b8c0;p=mezzo.git

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

33c1ab5ac05868be2f7a02cfae4332dc4025b8c0