From: Mike Jerris <mike@jerris.com>
Date: Tue, 17 Jan 2017 19:11:30 +0000 (-0600)
Subject: Merge pull request #1146 in FS/freeswitch from bugfix/FS-9206-proxy-media-with-enable... 
X-Git-Tag: v1.8.0~908
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ef273b4b3e6e17ddb732926bf9b6b463cf868ce;p=thirdparty%2Ffreeswitch.git

Merge pull request #1146 in FS/freeswitch from bugfix/FS-9206-proxy-media-with-enable-3pcc-proxy to master

* commit 'a597e216bc699567ddb77d1765cf095c3bb31183':
  FS-9206: [core] endable proxy media auto-adjust on re-invite for text and video every time as the streams may be being added on re-invite
---

5ef273b4b3e6e17ddb732926bf9b6b463cf868ce