From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 4 Feb 2016 01:06:13 +0000 (+0100)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.1~107
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1fc87e769a296a6432281481ad5d648efbfb433c;p=teleforma.git

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

1fc87e769a296a6432281481ad5d648efbfb433c