Merge "pjsip: Add option global/regcontext" into 13

author Joshua Colp <jcolp@digium.com>

Thu, 14 Jan 2016 12:32:04 +0000 (06:32 -0600)

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

Thu, 14 Jan 2016 12:32:04 +0000 (06:32 -0600)
author Joshua Colp <jcolp@digium.com>
Thu, 14 Jan 2016 12:32:04 +0000 (06:32 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 14 Jan 2016 12:32:04 +0000 (06:32 -0600)
diff --cc CHANGES
Simple merge
diff --cc configs/samples/pjsip.conf.sample
Simple merge
diff --cc include/asterisk/res_pjsip.h
Simple merge
diff --cc res/res_pjsip.c
Simple merge
diff --cc res/res_pjsip/pjsip_configuration.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Thu, 14 Jan 2016 12:32:04 +0000 (06:32 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 14 Jan 2016 12:32:04 +0000 (06:32 -0600)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
configs/samples/pjsip.conf.sample	patch \|	diff1 \|	diff2 \|	blob \| history
include/asterisk/res_pjsip.h	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip/pjsip_configuration.c	patch \|	diff1 \|	diff2 \|	blob \| history