Merge branch 'master' of https://github.com/ESTOS/strophe.jingle
Merge branch 'master' of https://github.com/ESTOS/strophe.jingle
Merge branch 'master' of https://github.com/sualko/strophe.jingle