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

Merge branch 'dev'
---

6725d75997f63cfabc37ac9382b205183f1e577e