From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 30 Mar 2016 08:43:51 +0000 (+0200)
Subject: Merge branch 'master' of github.com:Parisson/Telemeta
X-Git-Tag: 1.6b
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7333bf6d6c4eb13db61a9821e0809357a01e8420;p=telemeta.git

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

7333bf6d6c4eb13db61a9821e0809357a01e8420