From: Mike Jerris <mike@jerris.com>
Date: Mon, 11 Apr 2016 17:00:37 +0000 (-0500)
Subject: Merge pull request #656 in FS/freeswitch from mod_conf_enhancements to master
X-Git-Tag: v1.6.8~5^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beada9b0cb2eab67a81ee43e2c5da6362e18dde1;p=thirdparty%2Ffreeswitch.git

Merge pull request #656 in FS/freeswitch from mod_conf_enhancements to master

* commit 'c39fbb295f6b9bc01baa5dbfc578e12022c088ae':
  FS-8704: Add min-members, wait-min-members-timeout, wait-mod-timeout, wait-min-members-timeout-message, wait-mod-timeout-message, endconf-mod-exit-message, and endconf-message parameters and functionality to mod_conference.
---

beada9b0cb2eab67a81ee43e2c5da6362e18dde1