From: Emilie <zawadzki@ircam.fr>
Date: Fri, 25 Nov 2016 18:06:24 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=14424bedfef0bf187a873050a2a33516f3b4a574;p=mezzo.git

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

14424bedfef0bf187a873050a2a33516f3b4a574