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

Merge branch 'prodev' into pro
---

831bbfcd0621484e41e8aff1fdcc7d923977f609