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

Trivial merge