Merge 0.9->0.10

diff --cc plugins/mod_admin_telnet.lua
Simple merge

diff --cc prosody
Simple merge

diff --cc util/dependencies.lua
index 9d80d241ad38370c985e662d3b44e26743e070c4,4d50cf63a17452d76f17891cdba3f9e57d5eec51..ea19d9a8b606b4f5cfa1d372b54d0f117035135c
--- 1/util/dependencies.lua
--- 2/util/dependencies.lua
+++ b/util/dependencies.lua
@@@ -49,10 -49,18 +49,18 @@@ package.preload["util.ztact"] = functio
  end;
  
  function check_dependencies()
+       if _VERSION ~= "Lua 5.1" then
+               print "***********************************"
+               print("Unsupported Lua version: ".._VERSION);
+               print("Only Lua 5.1 is supported.");
+               print "***********************************"
+               return false;
+       end
+ 
        local fatal;
 -      
 +
        local lxp = softreq "lxp"
 -      
 +
        if not lxp then
                missingdep("luaexpat", {
                                ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0";