Merge remote branch 'fsorig/master'

Conflicts:
	conf/dialplan/default.xml

diff --cc conf/sip_profiles/internal.xml
Simple merge

diff --cc libs/freetdm/src/ftdm_io.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_cfg.c
index 657aa5e2069c68ccd13bcbad08bfba4da992b618,a869bda48ddcc09d88151de5d1a77afde5f5142c..f6d670c45ecefe3d2c3af7c18629b8800b78591f
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
--- 2/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
@@@ -190,8 -181,8 +190,9 @@@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm
        signal_data->min_digits = 8;
        signal_data->overlap_dial = SNGISDN_OPT_DEFAULT;
        signal_data->setup_arb = SNGISDN_OPT_DEFAULT;
 +      signal_data->facility_ie_decode = SNGISDN_OPT_TRUE;
        signal_data->timer_t3 = 8;
+       signal_data->restart_opt = SNGISDN_OPT_DEFAULT;
  
        signal_data->link_id = span->span_id;
        span->default_caller_data.bearer_capability = IN_ITC_SPEECH;

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