Merge pull request #961 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-9526...

author Mike Jerris <mike@jerris.com>

Mon, 19 Sep 2016 22:53:13 +0000 (17:53 -0500)

committer Mike Jerris <mike@jerris.com>

Mon, 19 Sep 2016 22:53:13 +0000 (17:53 -0500)
author Mike Jerris <mike@jerris.com>
Mon, 19 Sep 2016 22:53:13 +0000 (17:53 -0500)
committer Mike Jerris <mike@jerris.com>
Mon, 19 Sep 2016 22:53:13 +0000 (17:53 -0500)
diff --cc src/mod/applications/mod_conference/mod_conference.c
Simple merge
diff --cc src/mod/applications/mod_conference/mod_conference.h
Simple merge
author	Mike Jerris <mike@jerris.com>
	Mon, 19 Sep 2016 22:53:13 +0000 (17:53 -0500)
committer	Mike Jerris <mike@jerris.com>
	Mon, 19 Sep 2016 22:53:13 +0000 (17:53 -0500)
		1	2
src/mod/applications/mod_conference/mod_conference.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/applications/mod_conference/mod_conference.h	patch \|	diff1 \|	diff2 \|	blob \| history