]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into release/1.6.4
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 2 Jun 2017 13:32:06 +0000 (15:32 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 2 Jun 2017 13:33:15 +0000 (15:33 +0200)

Trivial merge