From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 27 Sep 2019 07:26:29 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.7.4~5^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=eefffd1db44b8984bf5966bd38c1fee90c8d29a7;p=telemeta.git

Merge branch 'master' into dev
---

eefffd1db44b8984bf5966bd38c1fee90c8d29a7