Merge "chan_pjsip: Fix ability to send UPDATE on COLP"

author Jenkins2 <jenkins2@gerrit.asterisk.org>

Wed, 5 Jul 2017 19:17:23 +0000 (14:17 -0500)

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

Wed, 5 Jul 2017 19:17:23 +0000 (14:17 -0500)
author Jenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 5 Jul 2017 19:17:23 +0000 (14:17 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 5 Jul 2017 19:17:23 +0000 (14:17 -0500)
diff --cc channels/chan_pjsip.c
Simple merge
diff --cc res/res_pjsip.c
Simple merge
author	Jenkins2 <jenkins2@gerrit.asterisk.org>
	Wed, 5 Jul 2017 19:17:23 +0000 (14:17 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 5 Jul 2017 19:17:23 +0000 (14:17 -0500)
		1	2
channels/chan_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history