# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1279377374 -18000
# Node ID a88576f675cbe2060296683fed35375deeec47b9
# Parent  9e2485880cd6e4650c51d69251eeaefdf2419427# Parent  02e668d64e0549141151f1ff902360824770bebf
Merge with trunk.

diff -r 9e2485880cd6 -r a88576f675cb net/server_event.lua
--- a/net/server_event.lua	Sat Jul 17 19:34:06 2010 +0500
+++ b/net/server_event.lua	Sat Jul 17 19:36:14 2010 +0500
@@ -468,7 +468,6 @@
 	function interface_mt:ondrain()
 	end
 	function interface_mt:onstatus()
-		debug("server.lua: Dummy onstatus()")
 	end
 end
 
diff -r 9e2485880cd6 -r a88576f675cb plugins/muc/mod_muc.lua
--- a/plugins/muc/mod_muc.lua	Sat Jul 17 19:34:06 2010 +0500
+++ b/plugins/muc/mod_muc.lua	Sat Jul 17 19:36:14 2010 +0500
@@ -35,7 +35,7 @@
 local max_history_messages = module:get_option_number("max_history_messages");
 
 local function is_admin(jid)
-	return um_is_admin(jid) or um_is_admin(jid, module.host);
+	return um_is_admin(jid, module.host);
 end
 
 local function room_route_stanza(room, stanza) core_post_stanza(component, stanza); end