From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 12 May 2016 15:25:52 +0000 (+0200)
Subject: Merge branch 'dev' into ThomasBalastegui-dev
X-Git-Tag: 1.6.2^2~18^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=529db75feb42947a2488302b87954b8e7672926d;p=telemeta.git

Merge branch 'dev' into ThomasBalastegui-dev
---

529db75feb42947a2488302b87954b8e7672926d