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

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

f9a00a5b8e9de2cf7177ddc132be079c525aabce