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

author David Yat Sin <dyatsin@sangoma.com>

Mon, 13 Jun 2011 20:22:20 +0000 (16:22 -0400)

committer David Yat Sin <dyatsin@sangoma.com>

Mon, 13 Jun 2011 20:22:20 +0000 (16:22 -0400)
author David Yat Sin <dyatsin@sangoma.com>
Mon, 13 Jun 2011 20:22:20 +0000 (16:22 -0400)
committer David Yat Sin <dyatsin@sangoma.com>
Mon, 13 Jun 2011 20:22:20 +0000 (16:22 -0400)
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
Simple merge
author	David Yat Sin <dyatsin@sangoma.com>
	Mon, 13 Jun 2011 20:22:20 +0000 (16:22 -0400)
committer	David Yat Sin <dyatsin@sangoma.com>
	Mon, 13 Jun 2011 20:22:20 +0000 (16:22 -0400)