Merge "pjsip_sdp_rtp: Add option endpoint/bind_rtp_to_media_address" into 13

author Joshua Colp <jcolp@digium.com>

Wed, 13 Jan 2016 01:45:33 +0000 (19:45 -0600)

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

Wed, 13 Jan 2016 01:45:34 +0000 (19:45 -0600)
author Joshua Colp <jcolp@digium.com>
Wed, 13 Jan 2016 01:45:33 +0000 (19:45 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 13 Jan 2016 01:45:34 +0000 (19:45 -0600)
diff --cc include/asterisk/res_pjsip.h
Simple merge
diff --cc res/res_pjsip.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Wed, 13 Jan 2016 01:45:33 +0000 (19:45 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 13 Jan 2016 01:45:34 +0000 (19:45 -0600)
		1	2
include/asterisk/res_pjsip.h	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history