Merge pull request #771 in FS/freeswitch from ~SAFAROV/freeswitch2:FS-7125 to master

author Mike Jerris <mike@jerris.com>

Tue, 29 Mar 2016 19:06:54 +0000 (14:06 -0500)

committer Mike Jerris <mike@jerris.com>

Tue, 29 Mar 2016 19:06:54 +0000 (14:06 -0500)
author Mike Jerris <mike@jerris.com>
Tue, 29 Mar 2016 19:06:54 +0000 (14:06 -0500)
committer Mike Jerris <mike@jerris.com>
Tue, 29 Mar 2016 19:06:54 +0000 (14:06 -0500)
diff --cc src/mod/endpoints/mod_sofia/mod_sofia.c
Simple merge
diff --cc src/mod/endpoints/mod_sofia/mod_sofia.h
Simple merge
diff --cc src/mod/endpoints/mod_sofia/sofia.c
Simple merge
author	Mike Jerris <mike@jerris.com>
	Tue, 29 Mar 2016 19:06:54 +0000 (14:06 -0500)
committer	Mike Jerris <mike@jerris.com>
	Tue, 29 Mar 2016 19:06:54 +0000 (14:06 -0500)
		1	2
src/mod/endpoints/mod_sofia/mod_sofia.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/endpoints/mod_sofia/mod_sofia.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/endpoints/mod_sofia/sofia.c	patch \|	diff1 \|	diff2 \|	blob \| history