# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1289621569 0
# Node ID e2cfc6b8fe5d7229ecfda468cb48a064c9da2a25
# Parent  418354197a02d564316857dab4dc0fb926c12d6c# Parent  6f4db418a9cc1531c7ac97071e41e94cb5f0d3d9
Merge backout

diff -r 6f4db418a9cc -r e2cfc6b8fe5d plugins/mod_pubsub.lua
--- a/plugins/mod_pubsub.lua	Sat Nov 13 04:12:40 2010 +0000
+++ b/plugins/mod_pubsub.lua	Sat Nov 13 04:12:49 2010 +0000
@@ -87,8 +87,10 @@
 	end
 end
 
+module:hook("iq/host/http://jabber.org/protocol/pubsub:pubsub", handle_pubsub_iq);
+
 service = pubsub.new({
 	broadcaster = simple_broadcast
 });
+module.environment.service = service;
 
-module:hook("iq/host/http://jabber.org/protocol/pubsub:pubsub", handle_pubsub_iq);