Merge remote-tracking branch 'smgfs/master'

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

diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
Simple merge

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

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
index edad62fc0ded3b263871116d4a7c26d5e21b67ff,f4fee712c92cc3319c1ef0e5d87d64465c839244..3ba776928dabe684b72a841e6944b7a2631de192
--- 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
@@@ -1128,9 -1108,9 +1131,9 @@@ ftdm_bearer_cap_t sngisdn_get_infoTranC
  {
        switch(bearer_capability) {
        case IN_ITC_SPEECH:
 -              return FTDM_BEARER_CAP_SPEECH;          
 +              return FTDM_BEARER_CAP_SPEECH;
        case IN_ITC_UNRDIG:
-               return FTDM_BEARER_CAP_64K_UNRESTRICTED;
+               return FTDM_BEARER_CAP_UNRESTRICTED;
        case IN_ITC_A31KHZ:
                return FTDM_BEARER_CAP_3_1KHZ_AUDIO;
        default:

diff --cc libs/freetdm/src/include/freetdm.h
Simple merge

diff --cc src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
Simple merge