From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 15 Dec 2015 22:08:46 +0000 (+0100)
Subject: Merge branch 'docker' into dev
X-Git-Tag: 1.6b~7^2~39
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2da3d609c7c9f686ee16f97882a2ebdd0ab2165f;p=telemeta.git

Merge branch 'docker' into dev

Conflicts:
	examples/deploy/start_app.sh
---

2da3d609c7c9f686ee16f97882a2ebdd0ab2165f