Merge "res_pjsip: Refactor endpt_send_request to include transaction timeout" into 13

author Matt Jordan <mjordan@digium.com>

Fri, 17 Apr 2015 20:29:40 +0000 (15:29 -0500)

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

Fri, 17 Apr 2015 20:29:40 +0000 (15:29 -0500)
author Matt Jordan <mjordan@digium.com>
Fri, 17 Apr 2015 20:29:40 +0000 (15:29 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 17 Apr 2015 20:29:40 +0000 (15:29 -0500)
diff --cc include/asterisk/res_pjsip.h
Simple merge
diff --cc res/res_pjsip.c
Simple merge
author	Matt Jordan <mjordan@digium.com>
	Fri, 17 Apr 2015 20:29:40 +0000 (15:29 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Fri, 17 Apr 2015 20:29:40 +0000 (15:29 -0500)
		1	2
include/asterisk/res_pjsip.h	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history