Merge remote branch 'fsorig/master'

author Moises Silva <moy@sangoma.com>

Mon, 22 Nov 2010 15:41:16 +0000 (10:41 -0500)

committer Moises Silva <moy@sangoma.com>

Mon, 22 Nov 2010 15:41:16 +0000 (10:41 -0500)
author Moises Silva <moy@sangoma.com>
Mon, 22 Nov 2010 15:41:16 +0000 (10:41 -0500)
committer Moises Silva <moy@sangoma.com>
Mon, 22 Nov 2010 15:41:16 +0000 (10:41 -0500)
diff --cc libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
Simple merge
author	Moises Silva <moy@sangoma.com>
	Mon, 22 Nov 2010 15:41:16 +0000 (10:41 -0500)
committer	Moises Silva <moy@sangoma.com>
	Mon, 22 Nov 2010 15:41:16 +0000 (10:41 -0500)