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