From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 4 Jul 2017 22:15:52 +0000 (+0200)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.1~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=278b4f4fef37c18ceae43400df16921ce2f8295e;p=teleforma.git

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

278b4f4fef37c18ceae43400df16921ce2f8295e