From: Mike Jerris <mike@jerris.com>
Date: Wed, 14 Sep 2016 17:49:12 +0000 (-0500)
Subject: Merge pull request #950 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-6954... 
X-Git-Tag: v1.6.11~9^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39bad0b32728d07ac940599ffa91ef4c335e650;p=thirdparty%2Ffreeswitch.git

Merge pull request #950 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-6954-freeswitch-adds-additional-m-audio to master

* commit 'd5b5e8c23bf78508f5296b188265496e6f4a6a5d':
  FS-6954: Use channel flags to check for proxy media or bypass media
---

f39bad0b32728d07ac940599ffa91ef4c335e650