From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 31 Jul 2018 22:23:38 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.7.1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4cb1b678e38458b6352320b30ae99a46db64e4ee;p=telemeta.git

Merge branch 'dev'
---

4cb1b678e38458b6352320b30ae99a46db64e4ee