From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 13 Nov 2015 14:40:08 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6b~7^2~56
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3fef3acc7ab9d31c7af38a81cd858851be0f95ae;p=telemeta.git

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

3fef3acc7ab9d31c7af38a81cd858851be0f95ae