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

Merge branch 'dev'
---

ca6c47db34384353c64029266f34d70004b9c5b3