From: Mike Jerris <mike@jerris.com>
Date: Mon, 19 Sep 2016 17:12:35 +0000 (-0500)
Subject: Merge pull request #964 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-9533... 
X-Git-Tag: v1.6.11~9^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5baf7d5b7435f639344f70f5e8414a7cfef5231;p=thirdparty%2Ffreeswitch.git

Merge pull request #964 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-9533 to master

* commit '1c00e64a9a40f5d5a305ff9ee269dbfd36002038':
  FS-9533 [mod_conference] add member-enter-sound
---

d5baf7d5b7435f639344f70f5e8414a7cfef5231