From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 11 Sep 2015 14:52:45 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6a
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b8b859b2d620ecdcb055554284805e29f68de95a;p=telemeta.git

Merge branch 'dev'
---

b8b859b2d620ecdcb055554284805e29f68de95a