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

Merge branch 'dev'
---

10f3964be949b658fd7096d34e2d3eae1fc12913