Merge branch 'master' into smgmaster

author Moises Silva <moy@sangoma.com>

Thu, 15 Sep 2011 16:57:25 +0000 (12:57 -0400)

committer Moises Silva <moy@sangoma.com>

Thu, 15 Sep 2011 16:57:25 +0000 (12:57 -0400)
author Moises Silva <moy@sangoma.com>
Thu, 15 Sep 2011 16:57:25 +0000 (12:57 -0400)
committer Moises Silva <moy@sangoma.com>
Thu, 15 Sep 2011 16:57:25 +0000 (12:57 -0400)
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c
Simple merge
author	Moises Silva <moy@sangoma.com>
	Thu, 15 Sep 2011 16:57:25 +0000 (12:57 -0400)
committer	Moises Silva <moy@sangoma.com>
	Thu, 15 Sep 2011 16:57:25 +0000 (12:57 -0400)