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