Merge pull request #592 in FS/freeswitch from bugfix/FS-8384 to master

author Anthony Minessale II <anthony.minessale@gmail.com>

Fri, 13 Nov 2015 00:48:49 +0000 (18:48 -0600)

committer Anthony Minessale II <anthony.minessale@gmail.com>

Fri, 13 Nov 2015 00:48:49 +0000 (18:48 -0600)
author Anthony Minessale II <anthony.minessale@gmail.com>
Fri, 13 Nov 2015 00:48:49 +0000 (18:48 -0600)
committer Anthony Minessale II <anthony.minessale@gmail.com>
Fri, 13 Nov 2015 00:48:49 +0000 (18:48 -0600)
diff --cc src/mod/applications/mod_conference/conference_member.c
Simple merge
diff --cc src/mod/applications/mod_conference/conference_video.c
Simple merge
diff --cc src/mod/applications/mod_conference/mod_conference.h
Simple merge
author	Anthony Minessale II <anthony.minessale@gmail.com>
	Fri, 13 Nov 2015 00:48:49 +0000 (18:48 -0600)
committer	Anthony Minessale II <anthony.minessale@gmail.com>
	Fri, 13 Nov 2015 00:48:49 +0000 (18:48 -0600)
		1	2
src/mod/applications/mod_conference/conference_member.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/applications/mod_conference/conference_video.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/applications/mod_conference/mod_conference.h	patch \|	diff1 \|	diff2 \|	blob \| history