Commits
![Moises Silva](https://secure.gravatar.com/avatar/2f60b06fecb402a2cb4a59bceeb28d98.jpg?s=96&d=mm)
Merge branch 'master' of git://git.freeswitch.org/freeswitch Conflicts: conf/autoload_configs/modules.conf.xml libs/freetdm/src/ftdm_sched.c libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
Merge branch 'master' of git://git.freeswitch.org/freeswitch Conflicts: conf/autoload_configs/modules.conf.xml libs/freetdm/src/ftdm_sched.c libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c