Merge pull request #581 from weiss/dh-param-file

author Alexey Shchepin <alexey@process-one.net>

Tue, 16 Jun 2015 08:59:06 +0000 (11:59 +0300)

committer Alexey Shchepin <alexey@process-one.net>

Tue, 16 Jun 2015 08:59:06 +0000 (11:59 +0300)
author Alexey Shchepin <alexey@process-one.net>
Tue, 16 Jun 2015 08:59:06 +0000 (11:59 +0300)
committer Alexey Shchepin <alexey@process-one.net>
Tue, 16 Jun 2015 08:59:06 +0000 (11:59 +0300)
diff --cc src/ejabberd_c2s.erl
Simple merge
diff --cc src/ejabberd_http.erl
Simple merge
diff --cc src/ejabberd_s2s_in.erl
Simple merge
diff --cc src/ejabberd_s2s_out.erl
Simple merge
author	Alexey Shchepin <alexey@process-one.net>
	Tue, 16 Jun 2015 08:59:06 +0000 (11:59 +0300)
committer	Alexey Shchepin <alexey@process-one.net>
	Tue, 16 Jun 2015 08:59:06 +0000 (11:59 +0300)
		1	2
src/ejabberd_c2s.erl	patch \|	diff1 \|	diff2 \|	blob \| history
src/ejabberd_http.erl	patch \|	diff1 \|	diff2 \|	blob \| history
src/ejabberd_s2s_in.erl	patch \|	diff1 \|	diff2 \|	blob \| history
src/ejabberd_s2s_out.erl	patch \|	diff1 \|	diff2 \|	blob \| history