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

Merge branch 'dev'
---

6b38395f24b5381dd3ae780ecf77ca3b1a54b88b