# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1413280767 -3600
# Node ID 7c8f58d2b3315d01447df52dff48965482f6eb42
# Parent  67501b5576d36bb6929aacbec4d6cfe51d48b1df# Parent  acae6289e0a6d7bc5809c134af1e98a3b8783988
Merge 0.9->0.10

diff -r 67501b5576d3 -r 7c8f58d2b331 plugins/mod_pubsub/pubsub.lib.lua
--- a/plugins/mod_pubsub/pubsub.lib.lua	Mon Oct 13 21:02:04 2014 +0200
+++ b/plugins/mod_pubsub/pubsub.lib.lua	Tue Oct 14 10:59:27 2014 +0100
@@ -18,7 +18,7 @@
 	["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" };
 	["item-not-found"] = { "cancel", "item-not-found" };
 	["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" };
-	["forbidden"] = { "cancel", "forbidden" };
+	["forbidden"] = { "auth", "forbidden" };
 	["not-allowed"] = { "cancel", "not-allowed" };
 };
 local function pubsub_error_reply(stanza, error)
diff -r 67501b5576d3 -r 7c8f58d2b331 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Mon Oct 13 21:02:04 2014 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Tue Oct 14 10:59:27 2014 +0100
@@ -47,7 +47,7 @@
 local function bounce_sendq(session, reason)
 	local sendq = session.sendq;
 	if not sendq then return; end
-	session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
+	session.log("info", "Sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
 	local dummy = {
 		type = "s2sin";
 		send = function(s)