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

Merge branch 'dev'
---

7125201b6fef7799538b5d230655714e4584dbd9