From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 24 Mar 2016 15:48:34 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6b~1^2~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=22ca8a2cca8c1785e1f292cae0abd86d64a0cb05;p=telemeta.git

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

22ca8a2cca8c1785e1f292cae0abd86d64a0cb05