From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 9 Nov 2016 11:34:43 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2d82d3ab3facdcb64328ffb14f56ac1201284115;p=mezzo.git

Merge branch 'dev'
---

2d82d3ab3facdcb64328ffb14f56ac1201284115