Merge branch 'master' of git.sangoma.com:smg_freeswitch

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/include/freetdm.h
Simple merge

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