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

Merge branch 'prodev' into pro
---

6a952793bfc93a8b24a316f0f47588344302a431