# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1276042272 -3600
# Node ID 1a8a5b89a5ade0a204cd28d60a1113e22f442b38
# Parent  f1db45e89317c0bb3e5109e01f5b545b06d593a1# Parent  ea80531e5cbc567c3e211d38749c45e8b66d33b7
Merge 0.7->trunk

diff -r f1db45e89317 -r 1a8a5b89a5ad plugins/mod_announce.lua
--- a/plugins/mod_announce.lua	Mon Jun 07 12:21:57 2010 +0100
+++ b/plugins/mod_announce.lua	Wed Jun 09 01:11:12 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 f1db45e89317 -r 1a8a5b89a5ad plugins/mod_compression.lua
--- a/plugins/mod_compression.lua	Mon Jun 07 12:21:57 2010 +0100
+++ b/plugins/mod_compression.lua	Wed Jun 09 01:11:12 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 f1db45e89317 -r 1a8a5b89a5ad tools/xep227toprosody.lua