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

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

d128544823bd5e7a7f0e0e93e4c58d124987c985