From: Mike Jerris <mike@jerris.com>
Date: Fri, 11 Nov 2016 21:35:15 +0000 (-0600)
Subject: Merge pull request #1035 in FS/freeswitch from ~CRIENZO/freeswitch:fs-9696 to master
X-Git-Tag: v1.8.0~1085
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50465dae850fc97ffe226503f5ef61681edfd8c4;p=thirdparty%2Ffreeswitch.git

Merge pull request #1035 in FS/freeswitch from ~CRIENZO/freeswitch:fs-9696 to master

* commit '11452979f6da94b515ee9b712a33d9957925a7d8':
  FS-9696 keep pickup endpoint up if another endpoint in dialstring hangs up and leg_timeout is set on the pickup endpoint
---

50465dae850fc97ffe226503f5ef61681edfd8c4