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

Merge branch 'dev'
---

dba964ee5c959700169a8386644a8a70b20d4a7d