From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 8 Nov 2016 16:29:22 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0790914a89e398eda6372181dbe1194b5df3341a;p=mezzo.git

Merge branch 'dev'
---

0790914a89e398eda6372181dbe1194b5df3341a