From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 27 Jul 2018 12:09:09 +0000 (+0200)
Subject: Merge branch 'dev' into release/1.7
X-Git-Tag: 1.7.0~2^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d299f3b4309f3f7a18e0b952265523f5a152ce50;p=telemeta.git

Merge branch 'dev' into release/1.7
---

d299f3b4309f3f7a18e0b952265523f5a152ce50