Commits
![Moises Silva](https://secure.gravatar.com/avatar/f4169d9da08bf5fc7453c9d89fdf092a.jpg?s=96&d=mm)
Merge branch 'master' into netborder Conflicts: libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c libs/freetdm/src/testsangomaboost.c
Merge branch 'master' into netborder Conflicts: libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c libs/freetdm/src/testsangomaboost.c