# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1387038355 -3600
# Node ID b5e8843cfbeba13be2de73ff893fe4150ce31f62
# Parent  783107f85ea085f25cb0ab563fbad92335bb9f12# Parent  31f14991070b838785246dc8cb5c997dbe66b5f4
Merge 0.10->trunk

diff -r 783107f85ea0 -r b5e8843cfbeb plugins/muc/mod_muc.lua
--- a/plugins/muc/mod_muc.lua	Fri Dec 13 12:53:14 2013 +0000
+++ b/plugins/muc/mod_muc.lua	Sat Dec 14 17:25:55 2013 +0100
@@ -164,7 +164,7 @@
 			return true;
 		end
 		if not(restrict_room_creation) or
-		  is_admin(stanza.attr.from)) or
+		  is_admin(stanza.attr.from) or
 		  (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then
 			room = create_room(bare);
 		end