Merge 0.10->trunk

diff --combined prosodyctl
index a83ec6123a844338b93efdeea96c109d329526fd,7c8659fb09d3aacb511adf8ec0d5ac3d455492f2..92606dd2537c82f353b032e954e63cea2f0b0869
--- 1/prosodyctl
--- 2/prosodyctl
+++ b/prosodyctl
@@@ -11,10 -11,10 +11,10 @@@
  
  -- Will be modified by configure script if run --
  
- CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
- CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
- CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
- CFG_DATADIR=os.getenv("PROSODY_DATADIR");
+ CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
+ CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
+ CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
+ CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
  
  -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
  
@@@ -365,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