From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 22 Dec 2017 10:45:15 +0000 (+0100)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~195^2~1^2~13
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=78730f6db1bd239bdcfb1bd697f5718610231bfb;p=teleforma.git

Merge branch 'prodev' into pro
---

78730f6db1bd239bdcfb1bd697f5718610231bfb