From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 21 Apr 2016 14:20:36 +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=05e16533ba9a3d677875cf54b6da8cfa6a5f944c;p=mezzo.git

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

05e16533ba9a3d677875cf54b6da8cfa6a5f944c