]> 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>
Sun, 3 Apr 2016 23:33:26 +0000 (01:33 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 3 Apr 2016 23:33:26 +0000 (01:33 +0200)

Trivial merge