Merge branch 'master' into smgmaster

author Moises Silva <moy@sangoma.com>

Fri, 29 Jul 2011 21:03:11 +0000 (17:03 -0400)

committer Moises Silva <moy@sangoma.com>

Fri, 29 Jul 2011 21:03:11 +0000 (17:03 -0400)
author Moises Silva <moy@sangoma.com>
Fri, 29 Jul 2011 21:03:11 +0000 (17:03 -0400)
committer Moises Silva <moy@sangoma.com>
Fri, 29 Jul 2011 21:03:11 +0000 (17:03 -0400)
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
Simple merge
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
Simple merge
author	Moises Silva <moy@sangoma.com>
	Fri, 29 Jul 2011 21:03:11 +0000 (17:03 -0400)
committer	Moises Silva <moy@sangoma.com>
	Fri, 29 Jul 2011 21:03:11 +0000 (17:03 -0400)
		1	2
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h	patch \|	diff1 \|	diff2 \|	blob \| history