From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 11 May 2016 09:42:21 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6.2^2~30
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bca139516d4ddd2d80e3e5cef047972aadd41566;p=telemeta.git

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

bca139516d4ddd2d80e3e5cef047972aadd41566