From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 10 May 2016 16:28:02 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a1cda5e6c037cd953f7f6bb4cf709fce2a9b2f5d;p=mezzo.git

Merge branch 'dev'
---

a1cda5e6c037cd953f7f6bb4cf709fce2a9b2f5d