From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 20 Oct 2016 15:23:58 +0000 (+0200)
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=12da1d23d0160b299e1f3a5f6fee06a0f79ec77a;p=mezzo.git

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

12da1d23d0160b299e1f3a5f6fee06a0f79ec77a