From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 27 Oct 2016 16:10:27 +0000 (+0200)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.1~58
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5e4f3e52168c772a909042e3c3b49451025d3266;p=teleforma.git

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

5e4f3e52168c772a909042e3c3b49451025d3266