From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 6 Apr 2018 15:21:37 +0000 (+0200)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ca996aade7e8ba4c3ec46f4b18e2bb045b765c52;p=teleforma.git

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

ca996aade7e8ba4c3ec46f4b18e2bb045b765c52