Commits
![João Mesquita](https://secure.gravatar.com/avatar/a7e4311fe4ce82a7fbe9bbd69cffc29f.jpg?s=96&d=mm)
Merge branch 'master' of git@git.freeswitch.org:freeswitch Conflicts: src/mod/applications/mod_conference/mod_conference.c
Merge branch 'master' of git@git.freeswitch.org:freeswitch Conflicts: src/mod/applications/mod_conference/mod_conference.c