Merge remote branch 'fsorig/master'

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

diff --cc libs/freetdm/src/ftdm_io.c
Simple merge

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

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

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_stack_out.c
index e269809c1ce429c9cd75fb14b280424018ef65cc,124cd965b4070d44bf6be8e69117da8e6c94294d..cb508a54b4d39c1520b959a1c9ca20bfa0f467dc
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
--- 2/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
@@@ -34,11 -34,14 +34,13 @@@
  
  #include "ftmod_sangoma_isdn.h"
  
- extern ftdm_status_t cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *ftdm);
- extern ftdm_status_t cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm);
- extern ftdm_status_t cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan);
- 
+ void sngisdn_snd_setup(ftdm_channel_t *ftdmchan);
+ void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan);
+ void sngisdn_snd_progress(ftdm_channel_t *ftdmchan);
+ void sngisdn_snd_connect(ftdm_channel_t *ftdmchan);
+ void sngisdn_snd_disconnect(ftdm_channel_t *ftdmchan);
+ void sngisdn_snd_release(ftdm_channel_t *ftdmchan, uint8_t glare);
  
 -
  void sngisdn_snd_setup(ftdm_channel_t *ftdmchan)
  {
        ConEvnt conEvnt;

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