Merge pull request #1058 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-9735...

author Mike Jerris <mike@jerris.com>

Mon, 21 Nov 2016 21:12:20 +0000 (15:12 -0600)

committer Mike Jerris <mike@jerris.com>

Mon, 21 Nov 2016 21:12:20 +0000 (15:12 -0600)
author Mike Jerris <mike@jerris.com>
Mon, 21 Nov 2016 21:12:20 +0000 (15:12 -0600)
committer Mike Jerris <mike@jerris.com>
Mon, 21 Nov 2016 21:12:20 +0000 (15:12 -0600)
diff --cc src/include/switch_ivr.h
Simple merge
diff --cc src/mod/endpoints/mod_sofia/sofia.c
Simple merge
diff --cc src/switch_ivr.c
Simple merge
author	Mike Jerris <mike@jerris.com>
	Mon, 21 Nov 2016 21:12:20 +0000 (15:12 -0600)
committer	Mike Jerris <mike@jerris.com>
	Mon, 21 Nov 2016 21:12:20 +0000 (15:12 -0600)
		1	2
src/include/switch_ivr.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/endpoints/mod_sofia/sofia.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/switch_ivr.c	patch \|	diff1 \|	diff2 \|	blob \| history