Merge branch 'master' into smgmaster

author David Yat Sin <dyatsin@sangoma.com>

Wed, 13 Oct 2010 21:20:49 +0000 (14:20 -0700)

committer David Yat Sin <dyatsin@sangoma.com>

Wed, 13 Oct 2010 21:20:49 +0000 (14:20 -0700)
author David Yat Sin <dyatsin@sangoma.com>
Wed, 13 Oct 2010 21:20:49 +0000 (14:20 -0700)
committer David Yat Sin <dyatsin@sangoma.com>
Wed, 13 Oct 2010 21:20:49 +0000 (14:20 -0700)
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/switch_core.c
Simple merge
author	David Yat Sin <dyatsin@sangoma.com>
	Wed, 13 Oct 2010 21:20:49 +0000 (14:20 -0700)
committer	David Yat Sin <dyatsin@sangoma.com>
	Wed, 13 Oct 2010 21:20:49 +0000 (14:20 -0700)
		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/switch_core.c	patch \|	diff1 \|	diff2 \|	blob \| history