Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder

author Moises Silva <moy@sangoma.com>

Mon, 14 Feb 2011 20:33:19 +0000 (15:33 -0500)

committer Moises Silva <moy@sangoma.com>

Mon, 14 Feb 2011 20:33:19 +0000 (15:33 -0500)
author Moises Silva <moy@sangoma.com>
Mon, 14 Feb 2011 20:33:19 +0000 (15:33 -0500)
committer Moises Silva <moy@sangoma.com>
Mon, 14 Feb 2011 20:33:19 +0000 (15:33 -0500)
diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
Simple merge
diff --cc libs/freetdm/src/ftdm_io.c
Simple merge
author	Moises Silva <moy@sangoma.com>
	Mon, 14 Feb 2011 20:33:19 +0000 (15:33 -0500)
committer	Moises Silva <moy@sangoma.com>
	Mon, 14 Feb 2011 20:33:19 +0000 (15:33 -0500)
		1	2
libs/freetdm/mod_freetdm/mod_freetdm.c	patch \|	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftdm_io.c	patch \|	diff1 \|	diff2 \|	blob \| history