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

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

dfa998eefa2a45ce988c91f09afe7fab27ce5f44