Commits
![Moises Silva](https://secure.gravatar.com/avatar/2f60b06fecb402a2cb4a59bceeb28d98.jpg?s=96&d=mm)
Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder Conflicts: libs/freetdm/mod_freetdm/mod_freetdm.c libs/freetdm/src/ftdm_state.c
Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder Conflicts: libs/freetdm/mod_freetdm/mod_freetdm.c libs/freetdm/src/ftdm_state.c