# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1475066702 -7200
# Node ID 589e27b47d56218492da451619828ec6b0a3c9b7
# Parent  8027eecc750f5d2f4ca88cc157c5a1d285701466# Parent  99abf5a5d8d3cd7b9f539b21dc8176d99e2f74d1
Merge 0.9->0.10

diff -r 8027eecc750f -r 589e27b47d56 .hgtags
--- a/.hgtags	Sat Sep 24 18:31:16 2016 +0200
+++ b/.hgtags	Wed Sep 28 14:45:02 2016 +0200
@@ -58,3 +58,4 @@
 b1c84d220c409b7b17cd41e850576db253406b0a 0.9.8
 7ec52755622f1009aaf7b02fc9bc91e8ad9974be 0.9.9
 352270bc04393910a567b569ede03358dbb728b5 0.9.10
+8613086779fa9276615c2af066d2a10c38d0c86e 0.9.11
diff -r 8027eecc750f -r 589e27b47d56 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Sat Sep 24 18:31:16 2016 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Wed Sep 28 14:45:02 2016 +0200
@@ -373,7 +373,7 @@
 	elseif session.direction == "outgoing" then
 		session.notopen = nil;
 		if not attr.id then
-			log("error", "Stream response from %s did not give us a stream id!", session.to_host);
+			log("warn", "Stream response did not give us a stream id!");
 			session:close({ condition = "undefined-condition", text = "Missing stream ID" });
 			return;
 		end
diff -r 8027eecc750f -r 589e27b47d56 prosodyctl
--- a/prosodyctl	Sat Sep 24 18:31:16 2016 +0200
+++ b/prosodyctl	Wed Sep 28 14:45:02 2016 +0200
@@ -364,8 +364,8 @@
 	end
 	local user, host = jid_split(arg[1]);
 	if not user and host then
-		show_message [[Failed to understand JID, please supply the JID you want to set the password for]]
-		show_usage [[passwd user@host]]
+		show_message [[Failed to understand JID, please supply the JID to the user account you want to delete]]
+		show_usage [[deluser user@host]]
 		return 1;
 	end
 	
diff -r 8027eecc750f -r 589e27b47d56 util/dependencies.lua