]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 10 Jun 2016 16:19:42 +0000 (18:19 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 10 Jun 2016 16:19:42 +0000 (18:19 +0200)

Trivial merge