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

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

a3e26c539b29ec9cf6c84d11bca0c9ce4a1c2aae