Merge branch 'smgmaster' of git.sangoma.com:/smg_freeswitch into smgmaster

author Konrad Hammel <konrad@sangoma.com>

Tue, 15 Mar 2011 14:53:59 +0000 (10:53 -0400)

committer Konrad Hammel <konrad@sangoma.com>

Tue, 15 Mar 2011 14:53:59 +0000 (10:53 -0400)
author Konrad Hammel <konrad@sangoma.com>
Tue, 15 Mar 2011 14:53:59 +0000 (10:53 -0400)
committer Konrad Hammel <konrad@sangoma.com>
Tue, 15 Mar 2011 14:53:59 +0000 (10:53 -0400)
diff --cc libs/esl/fs_cli.c
Simple merge
diff --cc src/mod/endpoints/mod_sofia/mod_sofia.c
Simple merge
author	Konrad Hammel <konrad@sangoma.com>
	Tue, 15 Mar 2011 14:53:59 +0000 (10:53 -0400)
committer	Konrad Hammel <konrad@sangoma.com>
	Tue, 15 Mar 2011 14:53:59 +0000 (10:53 -0400)
		1	2
libs/esl/fs_cli.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/endpoints/mod_sofia/mod_sofia.c	patch \|	diff1 \|	diff2 \|	blob \| history