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

Merge branch 'dev'
---

fa07a5468ffb31f7ffff645486f6da570c0c2b2e