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

Trivial merge