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

diff --cc libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index 75d165be1db9c243c4f30a8592d3964dea2055cb,19d5e14f698c2336afd5814583b811f1d6a95547..87ba7ed7283d0483fcfbda8d142860ffbac31c11
mode 100755,100644..100755
--- 1/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
--- 2/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c

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

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

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