From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 11 Feb 2016 15:38:29 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6b~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9bea0b8126c31f65f1288acc91e98e8bb9a55b42;p=telemeta.git

Merge branch 'dev'
---

9bea0b8126c31f65f1288acc91e98e8bb9a55b42