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

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

4c31851a416a15894cdcb035d925df728fa74a2c