Merge branch 'master' of git@git.freeswitch.org:freeswitch

author David Yat Sin <dyatsin@sangoma.com>

Thu, 22 Apr 2010 18:20:37 +0000 (14:20 -0400)

committer David Yat Sin <dyatsin@sangoma.com>

Thu, 22 Apr 2010 18:20:37 +0000 (14:20 -0400)
author David Yat Sin <dyatsin@sangoma.com>
Thu, 22 Apr 2010 18:20:37 +0000 (14:20 -0400)
committer David Yat Sin <dyatsin@sangoma.com>
Thu, 22 Apr 2010 18:20:37 +0000 (14:20 -0400)
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
Simple merge
author	David Yat Sin <dyatsin@sangoma.com>
	Thu, 22 Apr 2010 18:20:37 +0000 (14:20 -0400)
committer	David Yat Sin <dyatsin@sangoma.com>
	Thu, 22 Apr 2010 18:20:37 +0000 (14:20 -0400)