]> 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>
Thu, 21 Apr 2016 14:44:25 +0000 (16:44 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 21 Apr 2016 14:44:25 +0000 (16:44 +0200)

Trivial merge