From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 23 Feb 2016 00:08:22 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6b~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4685527e3e7b5fe5786b4496430871d762d39505;p=telemeta.git

Merge branch 'dev'
---

4685527e3e7b5fe5786b4496430871d762d39505