From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 30 Mar 2016 08:43:41 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6b~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=42a9c5be2953d9789846049f6ddf603a904e6d20;p=telemeta.git

Merge branch 'dev'
---

42a9c5be2953d9789846049f6ddf603a904e6d20