From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 24 Oct 2016 20:38:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'gitlab/patch-5' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d8fb44de092e8e1f9974adecbde02bf3f8e3ed74;p=mezzo.git

Merge remote-tracking branch 'gitlab/patch-5' into dev
---

d8fb44de092e8e1f9974adecbde02bf3f8e3ed74