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

Merge branch 'dev'
---

f9a2702fc1fc7b7b58c3573459077cf2fa6f00fa