# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266800667 0
# Node ID 0d84e1fcb533c8bf0750a86dc3d57e3a306e13d4
# Parent  1ae8a1ac93bd9c1154486efde4d78396af42e5f5# Parent  3cb04cdc019335a95b817a1792e720dd242c5aa2
Merge with 0.7

diff -r 1ae8a1ac93bd -r 0d84e1fcb533 plugins/mod_console.lua
--- a/plugins/mod_console.lua	Sun Feb 21 19:27:42 2010 -0500
+++ b/plugins/mod_console.lua	Mon Feb 22 01:04:27 2010 +0000
@@ -192,7 +192,7 @@
 	elseif section == "server" then
 		print [[server:version() - Show the server's version number]]
 		print [[server:uptime() - Show how long the server has been running]]
-		--print [[server:shutdown(reason) - Shut down the server, with an optional reason to be broadcast to all connections]]
+		print [[server:shutdown(reason) - Shut down the server, with an optional reason to be broadcast to all connections]]
 	elseif section == "config" then
 		print [[config:reload() - Reload the server configuration. Modules may need to be reloaded for changes to take effect.]]
 	elseif section == "console" then