]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/app' into test
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 11:56:54 +0000 (13:56 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 11:56:54 +0000 (13:56 +0200)

Trivial merge