Merge "Refactor usage pattern of xmldoc info tag." into 13

author zuul <zuul@gerrit.asterisk.org>

Tue, 16 Aug 2016 17:15:24 +0000 (12:15 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Tue, 16 Aug 2016 17:15:24 +0000 (12:15 -0500)
author zuul <zuul@gerrit.asterisk.org>
Tue, 16 Aug 2016 17:15:24 +0000 (12:15 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 16 Aug 2016 17:15:24 +0000 (12:15 -0500)
diff --cc channels/chan_sip.c
Simple merge
diff --cc res/res_xmpp.c
Simple merge
author	zuul <zuul@gerrit.asterisk.org>
	Tue, 16 Aug 2016 17:15:24 +0000 (12:15 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 16 Aug 2016 17:15:24 +0000 (12:15 -0500)
		1	2
channels/chan_sip.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_xmpp.c	patch \|	diff1 \|	diff2 \|	blob \| history