Merge remote branch 'fsorig/master'

diff --cc libs/freetdm/Makefile.am
Simple merge

diff --cc libs/freetdm/configure.ac
Simple merge

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_stack_hndl.c
Simple merge