From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 4 Apr 2016 21:59:10 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a5f782006eb8cb0a8cfe48b7b13d88226447cf1a;p=telemeta.git

Merge branch 'dev'
---

a5f782006eb8cb0a8cfe48b7b13d88226447cf1a