]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 23 Feb 2016 00:08:22 +0000 (01:08 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 23 Feb 2016 00:08:22 +0000 (01:08 +0100)

Trivial merge