Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git

Conflicts:
	src/server/game/Entities/Player/Player.cpp

2 files changed, 2 insertions, 2 deletions

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index dbc5f65c711..8226868fa7a 100755
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -75,7 +75,7 @@ extern int main(int argc, char **argv)
     // Command line parsing to get the configuration file name
     char const* cfg_file = _TRINITY_REALM_CONFIG;
     int c = 1;
-    while(c < argc)
+    while (c < argc)
     {
         if (strcmp(argv[c], "-c") == 0)
         {
diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp
index 67cb2a9f637..1b0800e48ae 100755
--- a/src/server/authserver/Server/AuthSocket.cpp
+++ b/src/server/authserver/Server/AuthSocket.cpp
@@ -147,7 +147,7 @@ typedef struct AuthHandler
 class PatcherRunnable: public ACE_Based::Runnable
 {
 public:
-    PatcherRunnable(class AuthSocket* );
+    PatcherRunnable(class AuthSocket*);
     void run();
 
 private: