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

author Moises Silva <moy@sangoma.com>

Wed, 8 Dec 2010 18:16:17 +0000 (13:16 -0500)

committer Moises Silva <moy@sangoma.com>

Wed, 8 Dec 2010 18:16:17 +0000 (13:16 -0500)
author Moises Silva <moy@sangoma.com>
Wed, 8 Dec 2010 18:16:17 +0000 (13:16 -0500)
committer Moises Silva <moy@sangoma.com>
Wed, 8 Dec 2010 18:16:17 +0000 (13:16 -0500)
diff --cc libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
Simple merge
author	Moises Silva <moy@sangoma.com>
	Wed, 8 Dec 2010 18:16:17 +0000 (13:16 -0500)
committer	Moises Silva <moy@sangoma.com>
	Wed, 8 Dec 2010 18:16:17 +0000 (13:16 -0500)