From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 13 Oct 2016 16:16:22 +0000 (+0200)
Subject: Merge branch 'playlist' of git+ssh://git.forge.ircam.fr/ircam-www into playlist
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=79060a877f9f263b9048809a1201925ce3fc70b5;p=mezzo.git

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

79060a877f9f263b9048809a1201925ce3fc70b5