From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 13 Nov 2017 14:44:29 +0000 (+0100)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.2~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3af665a1c582024262e1c6bc17e856c66b27b105;p=teleforma.git

Merge branch 'dev' of git.parisson.com:git/teleforma into dev
---

3af665a1c582024262e1c6bc17e856c66b27b105