Merge branch 'cluster_fix'

author Christophe Romain <christophe.romain@process-one.net>

Fri, 20 Nov 2015 13:52:36 +0000 (14:52 +0100)

committer Christophe Romain <christophe.romain@process-one.net>

Fri, 20 Nov 2015 13:52:36 +0000 (14:52 +0100)
author Christophe Romain <christophe.romain@process-one.net>
Fri, 20 Nov 2015 13:52:36 +0000 (14:52 +0100)
committer Christophe Romain <christophe.romain@process-one.net>
Fri, 20 Nov 2015 13:52:36 +0000 (14:52 +0100)
diff --cc Makefile.in
Simple merge
diff --cc ejabberdctl.template
Simple merge
diff --cc src/ejabberd_admin.erl
Simple merge
author	Christophe Romain <christophe.romain@process-one.net>
	Fri, 20 Nov 2015 13:52:36 +0000 (14:52 +0100)
committer	Christophe Romain <christophe.romain@process-one.net>
	Fri, 20 Nov 2015 13:52:36 +0000 (14:52 +0100)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
ejabberdctl.template	patch \|	diff1 \|	diff2 \|	blob \| history
src/ejabberd_admin.erl	patch \|	diff1 \|	diff2 \|	blob \| history