From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 22 Feb 2018 12:20:35 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.7.0~2^2~4^2~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=57f059cd1d6c31f3a045bb7094e91970425a70f4;p=telemeta.git

Merge branch 'master' into dev
---

57f059cd1d6c31f3a045bb7094e91970425a70f4