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