Merge with 0.5

diff --cc core/s2smanager.lua
Simple merge

diff --cc plugins/mod_legacyauth.lua
index 9a9c3902f0dfe242ce3b435056fb06787edd21ca,25967b33950a870e7c2eaa7683153c6837007c58..4d0d7ca126f163947413399d1027a43bfc3f0340
--- 1/plugins/mod_legacyauth.lua
--- 2/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@@ -42,10 -45,14 +44,12 @@@ module:add_iq_handler("c2s_unauthed", "
                                        :tag("username"):up()
                                        :tag("password"):up()
                                        :tag("resource"):up());
 -                              return true;                    
                        else
                                username, password, resource = t_concat(username), t_concat(password), t_concat(resource);
+                               username = nodeprep(username);
+                               resource = resourceprep(resource)
                                local reply = st.reply(stanza);
 -                              require "core.usermanager"
 -                              if username and resource and usermanager.validate_credentials(session.host, username, password) then
 +                              if usermanager.validate_credentials(session.host, username, password) then
                                        -- Authentication successful!
                                        local success, err = sessionmanager.make_authenticated(session, username);
                                        if success then