From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 13 Nov 2017 14:30:58 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.2~24^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=54f708a0874d8279737a59adfaa903864ea2e6dc;p=teleforma.git

Merge branch 'master' into dev
---

54f708a0874d8279737a59adfaa903864ea2e6dc