Merge "res_pjsip: disable multi domain to improve realtime performace" into 13

author Joshua Colp <jcolp@digium.com>

Wed, 27 Apr 2016 19:03:53 +0000 (14:03 -0500)

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

Wed, 27 Apr 2016 19:03:53 +0000 (14:03 -0500)
author Joshua Colp <jcolp@digium.com>
Wed, 27 Apr 2016 19:03:53 +0000 (14:03 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 27 Apr 2016 19:03:53 +0000 (14:03 -0500)
diff --cc include/asterisk/res_pjsip.h
Simple merge
diff --cc res/res_pjsip.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Wed, 27 Apr 2016 19:03:53 +0000 (14:03 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 27 Apr 2016 19:03:53 +0000 (14:03 -0500)
		1	2
include/asterisk/res_pjsip.h	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history