changes in registry.ja
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
Merge branch 'master' of github.com:like-me1/stropheXMPP
fix conflict