From: Mike Jerris <mike@jerris.com>
Date: Wed, 15 Jun 2016 23:38:07 +0000 (-0500)
Subject: Merge pull request #865 in FS/freeswitch from ~MZAKA/freeswitch:feature/FS-9192-proxy... 
X-Git-Tag: v1.6.10~1^2~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd5c4a539cc741eed28cfc8dd8b485a6bdd38906;p=thirdparty%2Ffreeswitch.git

Merge pull request #865 in FS/freeswitch from ~MZAKA/freeswitch:feature/FS-9192-proxy-hold to master

* commit '05cc7708188fa040dcb903cdcdae28990fa177a8':
  FS-9192-proxy-hold: proxy hold when proxy media and proxy mode are disabled; its similiar to proxy-refer
---

dd5c4a539cc741eed28cfc8dd8b485a6bdd38906