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

Merge branch 'dev'
---

24e07c48910d21a382282159159978d578c20380