# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1401277490 -3600
# Node ID be8eab694d6c53a63139318e040fac2b48197184
# Parent  8a01bce29834197d2a0c976849ef65325efcc788# Parent  6986ca5755680d2f9b64d1d79f482938cd7b93c8
Merge 0.10->trunk

diff -r 8a01bce29834 -r be8eab694d6c plugins/mod_admin_telnet.lua
--- a/plugins/mod_admin_telnet.lua	Sat May 24 01:27:09 2014 +0200
+++ b/plugins/mod_admin_telnet.lua	Wed May 28 12:44:50 2014 +0100
@@ -964,6 +964,19 @@
 	return setmetatable({ room = room_obj }, console_room_mt);
 end
 
+function def_env.muc:list(host)
+	local host_session = hosts[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 c = 0;
+	for name in keys(host_session.modules.muc.rooms) do
+		print(name);
+		c = c + 1;
+	end
+	return true, c.." rooms";
+end
+
 local um = require"core.usermanager";
 
 def_env.user = {};
diff -r 8a01bce29834 -r be8eab694d6c plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Sat May 24 01:27:09 2014 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Wed May 28 12:44:50 2014 +0100
@@ -576,6 +576,8 @@
 		return handlestanza(session, stanza);
 	end
 
+	module:fire_event("s2s-created", { session = session });
+
 	add_task(connect_timeout, function ()
 		if session.type == "s2sin" or session.type == "s2sout" then
 			return; -- Ok, we're connected