]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 21 Dec 2015 23:13:52 +0000 (00:13 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 21 Dec 2015 23:13:52 +0000 (00:13 +0100)

Trivial merge