From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 11 Sep 2019 21:19:40 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.7.4~5^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=90af173c0eed6f316b11fbbc70f582a547ed2bee;p=telemeta.git

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

90af173c0eed6f316b11fbbc70f582a547ed2bee