From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 1 Feb 2018 11:53:08 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=caf10003d48311f83b4e635a7853abd7feca3e39;p=teleforma.git

Merge branch 'master' into dev
---

caf10003d48311f83b4e635a7853abd7feca3e39