Merge 0.10 -> trunk

diff --cc plugins/mod_admin_telnet.lua
index 9185ac1ba41586c19cdc3f077315cc5e96488824,0fe6d2ad23a8dc5ca54a994173cffddc23b552a3..ee8a43dc7fa13482897a7bc3d10f52951b0e06d6
--- 1/plugins/mod_admin_telnet.lua
--- 2/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@@ -974,9 -974,10 +974,10 @@@ function def_env.muc:list(host
        if not host_session or not host_session.modules.muc then
                return nil, "Please supply the address of a local MUC component";
        end
+       local print = self.session.print;
        local c = 0;
 -      for name in keys(host_session.modules.muc.rooms) do
 -              print(name);
 +      for room in host_session.modules.muc.each_room() do
 +              print(room.jid);
                c = c + 1;
        end
        return true, c.." rooms";

diff --cc plugins/mod_storage_sql2.lua
Simple merge