Merge pull request #160 from runcom/protocol_options

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

Tue, 15 Apr 2014 15:01:21 +0000 (19:01 +0400)

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

Tue, 15 Apr 2014 15:01:21 +0000 (19:01 +0400)
author Alexey Shchepin <alexey@process-one.net>
Tue, 15 Apr 2014 15:01:21 +0000 (19:01 +0400)
committer Alexey Shchepin <alexey@process-one.net>
Tue, 15 Apr 2014 15:01:21 +0000 (19:01 +0400)
diff --cc doc/guide.tex
Simple merge
diff --cc src/ejabberd_c2s.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, 15 Apr 2014 15:01:21 +0000 (19:01 +0400)
committer	Alexey Shchepin <alexey@process-one.net>
	Tue, 15 Apr 2014 15:01:21 +0000 (19:01 +0400)
		1	2
doc/guide.tex	patch \|	diff1 \|	diff2 \|	blob \| history
src/ejabberd_c2s.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