From: David Yat Sin <dyatsin@sangoma.com>
Date: Fri, 3 Jun 2011 21:48:39 +0000 (-0400)
Subject: Merge remote branch 'smgfs/master'
X-Git-Tag: v1.2-rc1~108^2~11^2~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e8e23f57e74170f59d6394b66fce65bc7db2d3b;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'smgfs/master'

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
---

5e8e23f57e74170f59d6394b66fce65bc7db2d3b
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
index 61f340205d,30ee953c40..b0c3efe271
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
@@@ -105,7 -105,7 +104,9 @@@ void clear_call_data(sngisdn_chan_data_
  	sngisdn_info->spInstId = 0;
  	sngisdn_info->globalFlg = 0;
  	sngisdn_info->flags = 0;
+ 	sngisdn_info->transfer_data.type = SNGISDN_TRANSFER_NONE;
++
 +	ftdm_mutex_unlock(g_sngisdn_data.ccs[cc_id].mutex);
  	return;
  }