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

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

bf2937f85928ae21df64a64de7c58a3cb3eb63dc