Commits
Merge branch 'master' of git.sangoma.com:smg_freeswitch Conflicts: libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
Merge branch 'master' of git.sangoma.com:smg_freeswitch Conflicts: libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c