From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 22 Feb 2017 14:10:29 +0000 (+0100)
Subject: Merge branch 'dev' of gitlab.com:yomguy/vertigo into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=370330514dbe260ebfab35968140ad21b7205fb7;p=mezzo.git

Merge branch 'dev' of gitlab.com:yomguy/vertigo into dev
---

370330514dbe260ebfab35968140ad21b7205fb7