Merge "pjsip: Support dual stack automatically." into 14

author zuul <zuul@gerrit.asterisk.org>

Tue, 25 Oct 2016 03:50:30 +0000 (22:50 -0500)

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

Tue, 25 Oct 2016 03:50:30 +0000 (22:50 -0500)
author zuul <zuul@gerrit.asterisk.org>
Tue, 25 Oct 2016 03:50:30 +0000 (22:50 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 25 Oct 2016 03:50:30 +0000 (22:50 -0500)
diff --cc CHANGES
Simple merge
diff --cc res/res_rtp_asterisk.c
Simple merge
author	zuul <zuul@gerrit.asterisk.org>
	Tue, 25 Oct 2016 03:50:30 +0000 (22:50 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 25 Oct 2016 03:50:30 +0000 (22:50 -0500)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_rtp_asterisk.c	patch \|	diff1 \|	diff2 \|	blob \| history