From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 12 Nov 2015 14:14:31 +0000 (+0100)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.1~185
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b2fb8635c75806ea21e900dd79da7d366c829224;p=teleforma.git

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

b2fb8635c75806ea21e900dd79da7d366c829224