]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 17 Sep 2017 23:28:35 +0000 (01:28 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 17 Sep 2017 23:28:35 +0000 (01:28 +0200)

Trivial merge