]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
authorkapil <kgupta@sangoma.com>
Thu, 14 Jun 2012 10:15:51 +0000 (15:45 +0530)
committerkapil <kgupta@sangoma.com>
Thu, 14 Jun 2012 10:15:51 +0000 (15:45 +0530)
commit6b542763d9246f34a951442d646ea3ca694ff44e
tree92956fe1d702226fbbc9d821d7df03ac1f897b84
parent69197b1d0cec61c3580854a9960169b8f2c914df
parentbb075a6f10fba52d57498b81321223d52175ab09
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
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c