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

author kapil <kgupta@sangoma.com>

Thu, 14 Jun 2012 10:15:51 +0000 (15:45 +0530)

committer kapil <kgupta@sangoma.com>

Thu, 14 Jun 2012 10:15:51 +0000 (15:45 +0530)
author kapil <kgupta@sangoma.com>
Thu, 14 Jun 2012 10:15:51 +0000 (15:45 +0530)
committer kapil <kgupta@sangoma.com>
Thu, 14 Jun 2012 10:15:51 +0000 (15:45 +0530)
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
Simple merge
author	kapil <kgupta@sangoma.com>
	Thu, 14 Jun 2012 10:15:51 +0000 (15:45 +0530)
committer	kapil <kgupta@sangoma.com>
	Thu, 14 Jun 2012 10:15:51 +0000 (15:45 +0530)