From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 7 Nov 2016 18:53:25 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=33255ce15b45b96b3ec9697bad0e18a85c68b386;p=mezzo.git

Merge branch 'dev'
---

33255ce15b45b96b3ec9697bad0e18a85c68b386