From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 14 Oct 2016 13:14:34 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8e8250b4a7ae7a03ec16f7c33ad2296eb3f94f6a;p=mezzo.git

Merge branch 'dev'
---

8e8250b4a7ae7a03ec16f7c33ad2296eb3f94f6a