From: Mike Jerris <mike@jerris.com>
Date: Fri, 7 Nov 2014 14:09:05 +0000 (-0600)
Subject: Merge pull request #68 in FS/freeswitch from ~HRISTO/freeswitch:interrupt-conf-moh... 
X-Git-Tag: v1.4.14~2^2~40^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf7c161d36f21d9d990b2356152421beef8a34c8;p=thirdparty%2Ffreeswitch.git

Merge pull request #68 in FS/freeswitch from ~HRISTO/freeswitch:interrupt-conf-moh to master

* commit '94278b5e545b58bad784a95da6181fc5f299457f':
  allow enter and exit sounds to interrupt the MOH in a wait_mod conference
---

bf7c161d36f21d9d990b2356152421beef8a34c8