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

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

d3fdac26f0276393a049e97ed3203db562013c4f