From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 13 Apr 2016 22:45:36 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6.2^2~42
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f7e40f3a67cba26a9a97064d9361cb2c270b2154;p=telemeta.git

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

f7e40f3a67cba26a9a97064d9361cb2c270b2154