From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 9 Jun 2016 11:18:24 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6.3~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=44b00407f5f3114161d2b4c570317b25dd94dce1;p=telemeta.git

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

44b00407f5f3114161d2b4c570317b25dd94dce1