From: Matt Jordan <mjordan@digium.com>
Date: Fri, 17 Apr 2015 20:33:29 +0000 (-0500)
Subject: Merge topic 'ASTERISK-24863'
X-Git-Tag: 14.0.0-beta1~1057
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb347fa594e195c79cbda45cb55fde3e72f90f9c;p=thirdparty%2Fasterisk.git

Merge topic 'ASTERISK-24863'

* changes:
  res_pjsip: Add global option to limit the maximum time for initial qualifies
  pjsip_options: Add qualify_timeout processing and eventing
  res_pjsip: Refactor endpt_send_request to include transaction timeout
---

bb347fa594e195c79cbda45cb55fde3e72f90f9c