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

author David Yat Sin <dyatsin@sangoma.com>

Wed, 20 Jun 2012 17:21:22 +0000 (13:21 -0400)

committer David Yat Sin <dyatsin@sangoma.com>

Wed, 20 Jun 2012 17:21:22 +0000 (13:21 -0400)
author David Yat Sin <dyatsin@sangoma.com>
Wed, 20 Jun 2012 17:21:22 +0000 (13:21 -0400)
committer David Yat Sin <dyatsin@sangoma.com>
Wed, 20 Jun 2012 17:21:22 +0000 (13:21 -0400)
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
Simple merge
author	David Yat Sin <dyatsin@sangoma.com>
	Wed, 20 Jun 2012 17:21:22 +0000 (13:21 -0400)
committer	David Yat Sin <dyatsin@sangoma.com>
	Wed, 20 Jun 2012 17:21:22 +0000 (13:21 -0400)