From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 13 Sep 2015 19:16:04 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6b~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6efe72c9b2e7f7044685c505be1dd166089460dc;p=telemeta.git

Merge branch 'dev'
---

6efe72c9b2e7f7044685c505be1dd166089460dc