From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 2 Jun 2016 10:06:16 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6.2^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5939d01e600a6fe306feb0c19a6889e307266055;p=telemeta.git

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

5939d01e600a6fe306feb0c19a6889e307266055