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

Trivial merge