Merge "res_pjsip: Add rtp_keepalive endpoint option."

author Joshua Colp <jcolp@digium.com>

Mon, 20 Jul 2015 20:52:38 +0000 (15:52 -0500)

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

Mon, 20 Jul 2015 20:52:38 +0000 (15:52 -0500)
author Joshua Colp <jcolp@digium.com>
Mon, 20 Jul 2015 20:52:38 +0000 (15:52 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 20 Jul 2015 20:52:38 +0000 (15:52 -0500)
diff --cc CHANGES
Simple merge
diff --cc res/res_pjsip/pjsip_configuration.c
Simple merge
diff --cc res/res_pjsip_session.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Mon, 20 Jul 2015 20:52:38 +0000 (15:52 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 20 Jul 2015 20:52:38 +0000 (15:52 -0500)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip/pjsip_configuration.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip_session.c	patch \|	diff1 \|	diff2 \|	blob \| history