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