]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 14 Jun 2016 09:10:29 +0000 (11:10 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 14 Jun 2016 09:10:29 +0000 (11:10 +0200)

Trivial merge