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

Trivial merge