# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1326899260 0
# Node ID 3e33b2d2e48ebf0ba853f143840cb7faacdb13ac
# Parent  7341cc5c8da90fb536dcdbfe98f7a56680a06964# Parent  b34eee3712c34d1cc197453bd3eab4570195d97b
Merge with 0.9

diff -r 7341cc5c8da9 -r 3e33b2d2e48e prosodyctl
--- a/prosodyctl	Wed Jan 18 15:07:26 2012 +0000
+++ b/prosodyctl	Wed Jan 18 15:07:40 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