Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3

author Mathieu Rene <mrene@avgs.ca>

Wed, 20 Jun 2012 16:31:07 +0000 (12:31 -0400)

committer Mathieu Rene <mrene@avgs.ca>

Wed, 20 Jun 2012 16:31:07 +0000 (12:31 -0400)
author Mathieu Rene <mrene@avgs.ca>
Wed, 20 Jun 2012 16:31:07 +0000 (12:31 -0400)
committer Mathieu Rene <mrene@avgs.ca>
Wed, 20 Jun 2012 16:31:07 +0000 (12:31 -0400)
diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
Simple merge
diff --cc libs/freetdm/src/ftdm_io.c
Simple merge
author	Mathieu Rene <mrene@avgs.ca>
	Wed, 20 Jun 2012 16:31:07 +0000 (12:31 -0400)
committer	Mathieu Rene <mrene@avgs.ca>
	Wed, 20 Jun 2012 16:31:07 +0000 (12:31 -0400)
		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