From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 3 Jun 2018 22:51:37 +0000 (+0200)
Subject: Merge branch 'master' of github.com:Parisson/Telemeta
X-Git-Tag: 1.6.6~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f7dba7897a90d6dff5810b85b20a4a930cb4c026;p=telemeta.git

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

f7dba7897a90d6dff5810b85b20a4a930cb4c026