Merge branch 'master' of git.sangoma.com:smg_freeswitch

author David Yat Sin <dyatsin@sangoma.com>

Wed, 23 Feb 2011 21:21:30 +0000 (16:21 -0500)

committer David Yat Sin <dyatsin@sangoma.com>

Wed, 23 Feb 2011 21:21:30 +0000 (16:21 -0500)
author David Yat Sin <dyatsin@sangoma.com>
Wed, 23 Feb 2011 21:21:30 +0000 (16:21 -0500)
committer David Yat Sin <dyatsin@sangoma.com>
Wed, 23 Feb 2011 21:21:30 +0000 (16:21 -0500)
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
Simple merge
author	David Yat Sin <dyatsin@sangoma.com>
	Wed, 23 Feb 2011 21:21:30 +0000 (16:21 -0500)
committer	David Yat Sin <dyatsin@sangoma.com>
	Wed, 23 Feb 2011 21:21:30 +0000 (16:21 -0500)