From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 19 Jan 2018 14:49:35 +0000 (+0100)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~195^2~1^2~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=95f6a3fac71568aa8013a4c205849999c8d26e39;p=teleforma.git

Merge branch 'prodev' into pro
---

95f6a3fac71568aa8013a4c205849999c8d26e39