From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 15 Oct 2015 13:24:15 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6b~7^2~66
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d2afecd01d5f701f2755a978fe2510ba7c87eccd;p=telemeta.git

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

d2afecd01d5f701f2755a978fe2510ba7c87eccd