From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 24 Aug 2017 16:27:44 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6.4^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=187eb9b6bd234e111ed863236484a9d33c5f5205;p=telemeta.git

Merge branch 'dev' of github.com:Parisson/Telemeta into dev
---

187eb9b6bd234e111ed863236484a9d33c5f5205