From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 26 Jan 2018 08:45:32 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=25f957d7bdf69984e6bbf6d2d5ce205f7c843cc0;p=teleforma.git

Merge branch 'master' into dev
---

25f957d7bdf69984e6bbf6d2d5ce205f7c843cc0