From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 29 Jul 2018 20:59:54 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.7.0
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=431e98672214d8d02f288208ad692c6cfdcab64a;p=telemeta.git

Merge branch 'dev'
---

431e98672214d8d02f288208ad692c6cfdcab64a