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

Merge branch 'dev'
---

07999f6b35ff951b1cdc37a1360ac88bc617fd82