]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 16 Sep 2015 15:35:36 +0000 (17:35 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 16 Sep 2015 15:35:36 +0000 (17:35 +0200)

Trivial merge