*Merge.

--HG--
branch : trunk

src/game/Chat.h

@@ -71,6 +71,7 @@ class ChatHandler
         std::string PGetParseString(int32 entry, ...);
 
         int ParseCommands(const char* text);
+
     protected:
         explicit ChatHandler() : m_session(NULL) {}      // for CLI subclass
 
@@ -415,7 +416,7 @@ class ChatHandler
 
         bool HandleResetAllCommand(const char * args);
 
-		
+
 		// GM ticket command handlers
 		bool HandleGMTicketListCommand(const char* args);
 		bool HandleGMTicketListOnlineCommand(const char* args);
@@ -438,7 +439,7 @@ class ChatHandler
         bool HandlePasswordCommand(const char* args);
         bool HandleLockAccountCommand(const char* args);
         bool HandleRespawnCommand(const char* args);
-                
+
 		//New Wp Commands
 		bool HandleWpAddCommand(const char* args);
         bool HandleWpLoadPathCommand(const char* args);
@@ -527,7 +528,7 @@ class ChatHandler
         void SetSentErrorMessage(bool val){ sentErrorMessage = val;};
     private:
         WorldSession * m_session;                           // != NULL for chat command call and NULL for CLI command
-		
+
         // common global flag
         static bool load_command_table;
         bool sentErrorMessage;