# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1390274680 0
# Node ID 0f6399c86c10cbffb5d420268d58ef0c683079d0
# Parent  e7efa9703a3f9cbf8d82244d87b29ce602e61d72# Parent  e49c0c677c5d3ca7c0daa2b9c85fe06c5186d9ac
Merge 0.9->0.10

diff -r e7efa9703a3f -r 0f6399c86c10 plugins/muc/mod_muc.lua
--- a/plugins/muc/mod_muc.lua	Tue Jan 21 01:51:13 2014 +0100
+++ b/plugins/muc/mod_muc.lua	Tue Jan 21 03:24:40 2014 +0000
@@ -173,6 +173,7 @@
 	if room then
 		room:handle_stanza(origin, stanza);
 		if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
+			module:fire_event("muc-room-destroyed", { room = room });
 			rooms[bare] = nil; -- discard room
 		end
 	else
diff -r e7efa9703a3f -r 0f6399c86c10 tools/ejabberd2prosody.lua
--- a/tools/ejabberd2prosody.lua	Tue Jan 21 01:51:13 2014 +0100
+++ b/tools/ejabberd2prosody.lua	Tue Jan 21 03:24:40 2014 +0000
@@ -30,7 +30,7 @@
 
 function build_stanza(tuple, stanza)
 	assert(type(tuple) == "table", "XML node is of unexpected type: "..type(tuple));
-	if tuple[1] == "xmlelement" then
+	if tuple[1] == "xmlelement" or tuple[1] == "xmlel" then
 		assert(type(tuple[2]) == "string", "element name has type: "..type(tuple[2]));
 		assert(type(tuple[3]) == "table", "element attribute array has type: "..type(tuple[3]));
 		assert(type(tuple[4]) == "table", "element children array has type: "..type(tuple[4]));
@@ -247,7 +247,7 @@
 		end
 		muc_room(tuple[2][1], tuple[2][2], properties);
 	end;
-	config = function(tuple)
+	--[=[config = function(tuple)
 		if tuple[2] == "hosts" then
 			local output = io.output(); io.output("prosody.cfg.lua");
 			io.write("-- Configuration imported from ejabberd --\n");
@@ -275,7 +275,7 @@
 			io.output(output);
 			print("prosody.cfg.lua created");
 		end
-	end;
+	end;]=]
 };
 
 local arg = ...;