]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorEmilie <zawadzki@ircam.fr>
Mon, 2 Jan 2017 09:11:14 +0000 (10:11 +0100)
committerEmilie <zawadzki@ircam.fr>
Mon, 2 Jan 2017 09:11:14 +0000 (10:11 +0100)

Trivial merge