From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 4 Jul 2017 22:15:46 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.1~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=62321b59861f7b81b2477fdf75be1bd8d42ce520;p=teleforma.git

Merge branch 'dev'
---

62321b59861f7b81b2477fdf75be1bd8d42ce520