From: Emilie <zawadzki@ircam.fr>
Date: Wed, 21 Sep 2016 13:11:39 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into block-person2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=79e068bfba50873e9ece4356a8c3b8be4fb9ff40;p=mezzo.git

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

79e068bfba50873e9ece4356a8c3b8be4fb9ff40