From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 2 Jun 2017 13:32:06 +0000 (+0200)
Subject: Merge branch 'dev' into release/1.6.4
X-Git-Tag: search~2^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6a7fb7212b0a605990d7feb055193557df79b201;p=telemeta.git

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

6a7fb7212b0a605990d7feb055193557df79b201