From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sat, 1 Jul 2017 10:15:01 +0000 (+0200)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.1~15^2~9
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=603731a9ce038ad1d552f9f4eb5382c2e0ee0503;p=teleforma.git

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

603731a9ce038ad1d552f9f4eb5382c2e0ee0503