]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 4 Jan 2017 17:37:04 +0000 (18:37 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 4 Jan 2017 17:37:04 +0000 (18:37 +0100)

Trivial merge