From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 4 Jan 2017 17:47:23 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=08977d55a72edda495d7b047374019adaa59d6ad;p=mezzo.git

Merge branch 'dev'
---

08977d55a72edda495d7b047374019adaa59d6ad