Merged the Tametomo branch into trunk.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 6505e39f..737d1762 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -113,7 +113,7 @@ void LoginHandler::handleMessage(MessageIn *msg)
                     errorMessage = "You have been blocked by the GM Team";
                     break;
                 case 6:
-                    errorMessage = "You have been banned for 5 minutes";
+                    errorMessage = "You have been temporarily banned from the game. Please contact the GM team";
                     break;
                 case 9:
                     errorMessage = "This user name is already taken";