From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 6 Jun 2017 12:30:03 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: search~2^2~3^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e92b195ff5da74dafa198f07bf20ef0ee6954c66;p=telemeta.git

Merge branch 'dev' of github.com:Parisson/Telemeta into dev
---

e92b195ff5da74dafa198f07bf20ef0ee6954c66