Merge remote branch 'smgfs/master'

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

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
index 61f340205d13001835aa61776f9dce4ed1b404db,30ee953c4011f37c92e92f542b13025cb2911286..b0c3efe2714274e6ecb69235990f212eea5ce21c
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
--- 2/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;
  }