From: kapil <kgupta@sangoma.com>
Date: Thu, 14 Jun 2012 10:15:51 +0000 (+0530)
Subject: Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
X-Git-Tag: v1.2.3^2~71^2^2~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b542763d9246f34a951442d646ea3ca694ff44e;p=thirdparty%2Ffreeswitch.git

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

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
---

6b542763d9246f34a951442d646ea3ca694ff44e