Commits
![David Yat Sin](https://secure.gravatar.com/avatar/63872fe6f4cf22d95255307a4c958279.jpg?s=96&d=mm)
Merge branch 'master' into netborder Conflicts: libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c libs/freetdm/src/include/private/ftdm_core.h