From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 19 Oct 2017 13:13:30 +0000 (+0200)
Subject: Merge branch 'dev' into release/1.7
X-Git-Tag: 1.7.0~2^2~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e2eff6c63328dd6794d48e48d83fa60e604d31dd;p=telemeta.git

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

e2eff6c63328dd6794d48e48d83fa60e604d31dd