]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 13 Nov 2015 14:40:08 +0000 (15:40 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 13 Nov 2015 14:45:24 +0000 (15:45 +0100)

Trivial merge