From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 14 Dec 2015 17:00:22 +0000 (+0100)
Subject: Merge branch 'docker' of github.com:Parisson/Telemeta into docker
X-Git-Tag: 1.6b~7^2~39^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=04eb835c292257715af3b88f9ac15b20149bc448;p=telemeta.git

Merge branch 'docker' of github.com:Parisson/Telemeta into docker
---

04eb835c292257715af3b88f9ac15b20149bc448