Commits
![Moises Silva](https://secure.gravatar.com/avatar/2f60b06fecb402a2cb4a59bceeb28d98.jpg?s=96&d=mm)
Merge branch 'smgmaster' into releases.3.4 Conflicts: libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
Merge branch 'smgmaster' into releases.3.4 Conflicts: libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c