]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorEmilie Zawadzki <zawadzki@ircam.fr>
Mon, 16 Jan 2017 12:02:12 +0000 (13:02 +0100)
committerEmilie Zawadzki <zawadzki@ircam.fr>
Mon, 16 Jan 2017 12:02:12 +0000 (13:02 +0100)

Trivial merge