]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorEmilie Zawadzki <zawadzki@ircam.fr>
Wed, 18 Jan 2017 13:27:54 +0000 (14:27 +0100)
committerEmilie Zawadzki <zawadzki@ircam.fr>
Wed, 18 Jan 2017 13:27:54 +0000 (14:27 +0100)

Trivial merge