]> 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>
Tue, 10 May 2016 16:23:24 +0000 (18:23 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 10 May 2016 16:23:24 +0000 (18:23 +0200)

Trivial merge