From: Emilie <zawadzki@ircam.fr>
Date: Tue, 8 Nov 2016 17:48:30 +0000 (+0100)
Subject: giMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=360169e6ec8e890b062ee13f9d339c5425dcb59a;p=mezzo.git

giMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
---

360169e6ec8e890b062ee13f9d339c5425dcb59a