]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 11 Feb 2016 15:38:29 +0000 (16:38 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 11 Feb 2016 15:38:29 +0000 (16:38 +0100)

Trivial merge