From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 9 Jan 2017 23:21:21 +0000 (+0100)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.1~41
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3319f4dfaa777eef1061ea8bbeb00b9319d92d90;p=teleforma.git

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

3319f4dfaa777eef1061ea8bbeb00b9319d92d90