From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 17 Oct 2017 16:12:48 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6.4c~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e40fa93897192e7e3e40c81e7b1ecd247982288e;p=telemeta.git

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

e40fa93897192e7e3e40c81e7b1ecd247982288e