From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 19 May 2017 15:34:01 +0000 (+0200)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.1~15^2~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=52a13949ea0366c54c699adf8dbc4cc49b463b6a;p=teleforma.git

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

52a13949ea0366c54c699adf8dbc4cc49b463b6a