# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1483322811 -3600
# Node ID 4d182b9a810988fcb1de6531b206e3339752e9a0
# Parent  dadf9ba290c58dc6aa8c9542dd0eab734de5ebd8# Parent  802dc0691177f704fa97546fa558e5eda5f99105
Merge 0.10->trunk

diff -r dadf9ba290c5 -r 4d182b9a8109 core/stanza_router.lua
--- a/core/stanza_router.lua	Sun Jan 01 19:42:12 2017 +0100
+++ b/core/stanza_router.lua	Mon Jan 02 03:06:51 2017 +0100
@@ -74,7 +74,7 @@
 				origin.send(st.error_reply(stanza, "modify", "bad-request", "Missing required 'id' attribute"));
 				return;
 			elseif (st_type == "set" or st_type == "get") and (#stanza.tags ~= 1) then
-				origin.send(st.error_reply(stanza, "modify", "bad-request", "Incorrect number of children for IQ stanz"));
+				origin.send(st.error_reply(stanza, "modify", "bad-request", "Incorrect number of children for IQ stanza"));
 				return;
 			end
 		end
diff -r dadf9ba290c5 -r 4d182b9a8109 prosody
--- a/prosody	Sun Jan 01 19:42:12 2017 +0100
+++ b/prosody	Mon Jan 02 03:06:51 2017 +0100
@@ -95,7 +95,7 @@
 		print("\n");
 		print("**************************");
 		if level == "parser" then
-			print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":");
+			print("A problem occurred while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":");
 			print("");
 			local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)");
 			if err:match("chunk has too many syntax levels$") then