From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 13 Nov 2017 14:24:41 +0000 (+0100)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.2~24^2^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=16c174f01d9197038b862b2a46bd1d4613be82d1;p=teleforma.git

Merge branch 'master' of git.parisson.com:git/teleforma
---

16c174f01d9197038b862b2a46bd1d4613be82d1