From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 19 Dec 2017 14:59:46 +0000 (+0100)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~195^2~1^2~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=685f571427370dbaac1e058727a95af881924ab9;p=teleforma.git

Merge branch 'prodev' into pro
---

685f571427370dbaac1e058727a95af881924ab9