From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 4 Jan 2017 17:37:04 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ef03b7599cb829dc293290f2d564f5158643918e;p=mezzo.git

Merge branch 'dev'
---

ef03b7599cb829dc293290f2d564f5158643918e