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

Merge branch 'dev'
---

b2ebd297910cbf226c1a83c09f7240a9d0817b15