# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1276042306 -3600
# Node ID ba5388966742cce10daafb9aeda74bf7a0a03121
# Parent  1a8a5b89a5ade0a204cd28d60a1113e22f442b38# Parent  5a4e766a3577fff06310509431e5608a9da9f159
Merge trunk/MattJ->trunk

diff -r 5a4e766a3577 -r ba5388966742 plugins/mod_announce.lua
--- a/plugins/mod_announce.lua	Tue Jun 08 16:21:14 2010 +0500
+++ b/plugins/mod_announce.lua	Wed Jun 09 01:11:46 2010 +0100
@@ -22,7 +22,6 @@
 	if not is_admin(stanza.attr.from) then
 		-- Not an admin? Not allowed!
 		module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(stanza.attr.from)));
-		origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 		return;
 	end
 	
diff -r 5a4e766a3577 -r ba5388966742 plugins/mod_compression.lua
--- a/plugins/mod_compression.lua	Tue Jun 08 16:21:14 2010 +0500
+++ b/plugins/mod_compression.lua	Wed Jun 09 01:11:46 2010 +0100
@@ -96,7 +96,6 @@
 -- setup compression for a stream
 local function setup_compression(session, deflate_stream)
 	add_filter(session, "bytes/out", function(t)
-		session.log(t)
 		local status, compressed, eof = pcall(deflate_stream, tostring(t), 'sync');
 		if status == false then
 			session:close({
diff -r 5a4e766a3577 -r ba5388966742 tools/xep227toprosody.lua