Merge pull request #1351 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:featu...

author Mike Jerris <mike@jerris.com>

Wed, 27 Feb 2019 20:47:57 +0000 (14:47 -0600)

committer Mike Jerris <mike@jerris.com>

Wed, 27 Feb 2019 20:47:57 +0000 (14:47 -0600)
author Mike Jerris <mike@jerris.com>
Wed, 27 Feb 2019 20:47:57 +0000 (14:47 -0600)
committer Mike Jerris <mike@jerris.com>
Wed, 27 Feb 2019 20:47:57 +0000 (14:47 -0600)
diff --cc build/modules.conf.in
Simple merge
diff --cc conf/vanilla/autoload_configs/modules.conf.xml
Simple merge
diff --cc configure.ac
Simple merge
diff --cc debian/control-modules
Simple merge
diff --cc freeswitch.spec
Simple merge
author	Mike Jerris <mike@jerris.com>
	Wed, 27 Feb 2019 20:47:57 +0000 (14:47 -0600)
committer	Mike Jerris <mike@jerris.com>
	Wed, 27 Feb 2019 20:47:57 +0000 (14:47 -0600)
		1	2
build/modules.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
conf/vanilla/autoload_configs/modules.conf.xml	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control-modules	patch \|	diff1 \|	diff2 \|	blob \| history
freeswitch.spec	patch \|	diff1 \|	diff2 \|	blob \| history