]> git.parisson.com Git - mezzo.git/commitdiff
Merge remote-tracking branch 'vertigo/master' into merging-vertigo
authorEmilie <zawadzki@ircam.fr>
Wed, 22 Mar 2017 10:29:55 +0000 (11:29 +0100)
committerEmilie <zawadzki@ircam.fr>
Wed, 22 Mar 2017 10:29:55 +0000 (11:29 +0100)

Trivial merge