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

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

866b1aefe6f114dedc091ae507a8dfc6399e6371