# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1286743064 -3600
# Node ID 1fdd201c1d434fc5970255efe86c0b1d03c09783
# Parent  d137515e0701d2e11d93f8c3409f5ab083f2969d# Parent  7410d1005fea821d9646cfbd4d4d5106afc360f1
Merge Zash->trunk

diff -r d137515e0701 -r 1fdd201c1d43 mod_muc_intercom/mod_muc_intercom.lua
--- a/mod_muc_intercom/mod_muc_intercom.lua	Thu Oct 07 16:20:28 2010 +0100
+++ b/mod_muc_intercom/mod_muc_intercom.lua	Sun Oct 10 21:37:44 2010 +0100
@@ -19,6 +19,7 @@
 	local from_room, from_host, from_nick = jid.split(from_room_jid);
 
 	local body = stanza:get_child("body");
+	if not body then return; end -- No body, like topic changes
 	body = body and body:get_text(); -- I feel like I want to do `or ""` there :/
 	local target_room, message = body:match("^@([^:]+):(.*)");
 	if not target_room or not message then return; end