]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 15 Oct 2015 13:24:15 +0000 (15:24 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 15 Oct 2015 13:24:15 +0000 (15:24 +0200)

Trivial merge