Merge remote branch 'fsorig/master'

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
	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/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
index 8ae33cee0aad67790441e9671e4e7247c6f1efef,72b6def4ae8c93bd760b1d8bd3bd993adc305955..fe11e194b2dc9c63f031fd9095511bb4e2f78e59
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
--- 2/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
@@@ -990,19 -997,21 +997,21 @@@ void sngisdn_rcv_sng_log(uint8_t level
  
      switch (level) {
                case SNG_LOGLEVEL_DEBUG:
 -                      ftdm_log(FTDM_LOG_DEBUG, "sng_isdn->%s", data);
 +                      ftdm_log(FTDM_LOG_DEBUG, "sng_isdn->%s\n", data);
                        break;
                case SNG_LOGLEVEL_WARN:
-                       ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s\n", data);
+                       if ( strncmp(data, "Invalid Q.921/Q.931 frame", 25) ) {
+                               ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s", data);
+                       }
                        break;
                case SNG_LOGLEVEL_INFO:
 -                      ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s", data);
 +                      ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s\n", data);
                        break;
                case SNG_LOGLEVEL_STATS:
 -                      ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s", data);
 +                      ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s\n", data);
                        break;
                case SNG_LOGLEVEL_ERROR:
 -                      ftdm_log(FTDM_LOG_ERROR, "sng_isdn->%s", data);
 +                      ftdm_log(FTDM_LOG_ERROR, "sng_isdn->%s\n", data);
                        /*ftdm_assert(0, "Got an error from stack");*/
                        break;
                case SNG_LOGLEVEL_CRIT:

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.c
Simple merge