# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1369576921 -7200
# Node ID 2427c81da16c2b05cce9326a178721d1bb1461cc
# Parent  0439d1349dc14e3d308d30427295cbe675fec799# Parent  ba5c2f6b799edc1895b456c6991bfb20413f37f0
Merge 0.9->trunk

diff -r 0439d1349dc1 -r 2427c81da16c util/pubsub.lua
--- a/util/pubsub.lua	Fri May 17 18:35:50 2013 +0200
+++ b/util/pubsub.lua	Sun May 26 16:02:01 2013 +0200
@@ -350,7 +350,7 @@
 			if node then -- Return only subscriptions to this node
 				if subscribed_nodes[node] then
 					ret[#ret+1] = {
-						node = subscribed_nodes[node];
+						node = node;
 						jid = jid;
 						subscription = node_obj.subscribers[jid];
 					};