From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 17 Sep 2017 21:51:22 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.6.4a~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f89e68a5c0315f4cc8ab317f2959a24c9b6483d0;p=telemeta.git

Merge branch 'master' into dev
---

f89e68a5c0315f4cc8ab317f2959a24c9b6483d0