From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 5 Jul 2018 15:15:53 +0000 (+0200)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.3.1~16^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b9bb842bed5213fa1abe53675e4ec290aa7af836;p=teleforma.git

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

b9bb842bed5213fa1abe53675e4ec290aa7af836