Merge branch 'master' into netborder

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

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

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

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
index fd9edeba8dfa80b70181f9e045d924fa70cc7e97,e7488c72abd1b78ba3792bc794beb7561c42a61f..e63ed16a7787e1af9f631e8098522ab700a6cc89
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
--- 2/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
@@@ -120,10 -132,7 +132,7 @@@ void sngisdn_trace_raw_q921(sngisdn_spa
        
        sigev.ev_data.trace.dir = dir;
        sigev.ev_data.trace.type = FTDM_TRACE_TYPE_Q921;
 -
 +      
-       /* TODO: Map trace to call ID here */
-       sigev.call_id = 0;
-       
        raw_data = ftdm_malloc(data_len);
        ftdm_assert(raw_data, "Failed to malloc");