]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 13 Sep 2015 19:16:04 +0000 (21:16 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 13 Sep 2015 19:16:04 +0000 (21:16 +0200)

Trivial merge