Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch

author David Yat Sin <dyatsin@sangoma.com>

Mon, 6 Jun 2011 14:57:30 +0000 (10:57 -0400)

committer David Yat Sin <dyatsin@sangoma.com>

Mon, 6 Jun 2011 14:57:30 +0000 (10:57 -0400)
author David Yat Sin <dyatsin@sangoma.com>
Mon, 6 Jun 2011 14:57:30 +0000 (10:57 -0400)
committer David Yat Sin <dyatsin@sangoma.com>
Mon, 6 Jun 2011 14:57:30 +0000 (10:57 -0400)
diff --cc libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
Simple merge
author	David Yat Sin <dyatsin@sangoma.com>
	Mon, 6 Jun 2011 14:57:30 +0000 (10:57 -0400)
committer	David Yat Sin <dyatsin@sangoma.com>
	Mon, 6 Jun 2011 14:57:30 +0000 (10:57 -0400)