From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 17 Sep 2017 23:28:11 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6.4b~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8667c1480640fcea1b288a24798cba85c42ad8d3;p=telemeta.git

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

8667c1480640fcea1b288a24798cba85c42ad8d3