From: Christophe Romain <christophe.romain@process-one.net>
Date: Wed, 30 Nov 2016 09:30:19 +0000 (+0100)
Subject: Merge branch 'docker' from Rafael Römhild
X-Git-Tag: 16.12~24^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cd70280d252e5273c82ee197291149086d2e1aa;p=ejabberd

Merge branch 'docker' from Rafael Römhild
---

2cd70280d252e5273c82ee197291149086d2e1aa