From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 31 Jul 2018 22:22:40 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.7.1~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=40b1fe8a05448f11a912f58acb02c65e62d9b748;p=telemeta.git

Merge branch 'dev'
---

40b1fe8a05448f11a912f58acb02c65e62d9b748