From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 7 Mar 2016 08:38:29 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6b~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cbe0c28f0a3b93bc6b3a4e85e5d02595630ae820;p=telemeta.git

Merge branch 'dev'
---

cbe0c28f0a3b93bc6b3a4e85e5d02595630ae820