Merge pull request #687 in FS/freeswitch from freetdm_patch to master

* commit '320d5f2015976fed9ca282dfeeb2bd3e977e6f76':
  Applied the Sangoma patch to FS version 1.2 in order to port to FS v1.6+

diff --cc src/include/switch_core.h
Simple merge

diff --cc src/include/switch_types.h
Simple merge

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

diff --cc src/switch_apr.c
Simple merge

diff --cc src/switch_core.c
Simple merge