]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 29 Feb 2016 16:28:06 +0000 (17:28 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 29 Feb 2016 16:28:06 +0000 (17:28 +0100)

Trivial merge