# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1369601946 -7200
# Node ID 78bc91f0d74b182b1c6599e001abaa0c5c9f9b32
# Parent  2427c81da16c2b05cce9326a178721d1bb1461cc# Parent  5f3c0b11aa8879f03be782ac1f22660fdb2534cd
Merge 0.9->trunk

diff -r 2427c81da16c -r 78bc91f0d74b plugins/mod_admin_telnet.lua
--- a/plugins/mod_admin_telnet.lua	Sun May 26 16:02:01 2013 +0200
+++ b/plugins/mod_admin_telnet.lua	Sun May 26 22:59:06 2013 +0200
@@ -940,6 +940,8 @@
 
 function def_env.muc:create(room_jid)
 	local room, host = check_muc(room_jid);
+	if not room then return nil, host end
+	if hosts[host].modules.muc.rooms[room_jid] then return nil, "Room exists already" end
 	return hosts[host].modules.muc.create_room(room_jid);
 end