Merge "res_pjsip: Fix statsd regression." into 13

author zuul <zuul@gerrit.asterisk.org>

Wed, 13 Jul 2016 12:28:31 +0000 (07:28 -0500)

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

Wed, 13 Jul 2016 12:28:31 +0000 (07:28 -0500)
author zuul <zuul@gerrit.asterisk.org>
Wed, 13 Jul 2016 12:28:31 +0000 (07:28 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 13 Jul 2016 12:28:31 +0000 (07:28 -0500)
diff --cc CHANGES
Simple merge
diff --cc include/asterisk/res_pjsip.h
Simple merge
diff --cc res/res_pjsip/pjsip_configuration.c
Simple merge
author	zuul <zuul@gerrit.asterisk.org>
	Wed, 13 Jul 2016 12:28:31 +0000 (07:28 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 13 Jul 2016 12:28:31 +0000 (07:28 -0500)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
include/asterisk/res_pjsip.h	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip/pjsip_configuration.c	patch \|	diff1 \|	diff2 \|	blob \| history