]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 30 Mar 2016 08:43:41 +0000 (10:43 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 30 Mar 2016 08:43:41 +0000 (10:43 +0200)

Trivial merge