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

Merge branch 'dev'
---

1bd6e3a7f602f8573e41d0bef2c3be215b184ea6