Merge 0.10->trunk

diff --combined prosodyctl
index c54af270e5fa22c3cf96d999becb4edd65c98981,aa4999c9f4c3d61d6e7d0e05a574cd15591f1c01..3cbcde3b4b7cad6c98de504d25758825244d3c36
--- 1/prosodyctl
--- 2/prosodyctl
+++ b/prosodyctl
@@@ -233,6 -233,7 +233,7 @@@ local function make_host(hostname
                type = "local",
                events = prosody.events,
                modules = {},
+               sessions = {},
                users = require "core.usermanager".new_null_provider(hostname)
        };
  end
@@@ -364,8 -365,8 +365,8 @@@ function commands.deluser(arg
        end
        local user, host = jid_split(arg[1]);
        if not user and host then
 -              show_message [[Failed to understand JID, please supply the JID you want to set the password for]]
 -              show_usage [[passwd user@host]]
 +              show_message [[Failed to understand JID, please supply the JID to the user account you want to delete]]
 +              show_usage [[deluser user@host]]
                return 1;
        end