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

Merge branch 'dev'
---

58d65d7120dddaa63343e2afc96034b4a2755d53