# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1326899285 0
# Node ID d1ddfc4709ce74ef24fe40256f98c42ded9a95a9
# Parent  3e33b2d2e48ebf0ba853f143840cb7faacdb13ac# Parent  b08a46cf06e680ee02d07beaafbbc69beb9b4eef
Merge with trunk

diff -r b08a46cf06e6 -r d1ddfc4709ce plugins/mod_tls.lua
--- a/plugins/mod_tls.lua	Wed Jan 18 08:54:26 2012 +0500
+++ b/plugins/mod_tls.lua	Wed Jan 18 15:08:05 2012 +0000
@@ -75,7 +75,7 @@
 module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza)
 	module:log("debug", "Received features element");
 	if can_do_tls(session) and stanza:child_with_ns(xmlns_starttls) then
-		module:log("%s is offering TLS, taking up the offer...", session.to_host);
+		module:log("debug", "%s is offering TLS, taking up the offer...", session.to_host);
 		session.sends2s("<starttls xmlns='"..xmlns_starttls.."'/>");
 		return true;
 	end
diff -r b08a46cf06e6 -r d1ddfc4709ce prosodyctl
--- a/prosodyctl	Wed Jan 18 08:54:26 2012 +0500
+++ b/prosodyctl	Wed Jan 18 15:08:05 2012 +0000
@@ -540,7 +540,7 @@
 
 function commands.reload(arg)
 	if arg[1] == "--help" then
-		show_usage([[reload]], [[Reload prosody configuration file]]);
+		show_usage([[reload]], [[Reload Prosody's configuration and re-open log files]]);
 		return 1;
 	end