]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 25 Apr 2016 21:42:01 +0000 (23:42 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 25 Apr 2016 21:42:01 +0000 (23:42 +0200)

Trivial merge