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/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
index 82ca9146c75..6149a680594 100755
--- a/src/server/shared/Cryptography/BigNumber.cpp
+++ b/src/server/shared/Cryptography/BigNumber.cpp
@@ -42,7 +42,7 @@ BigNumber::BigNumber(uint32 val)
 BigNumber::~BigNumber()
 {
     BN_free(_bn);
-    if(_array) delete[] _array;
+    if (_array) delete[] _array;
 }
 
 void BigNumber::SetDword(uint32 val)
diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp
index 6f2c985ddfb..c60b8bfb70a 100755
--- a/src/server/shared/Cryptography/SHA1.cpp
+++ b/src/server/shared/Cryptography/SHA1.cpp
@@ -50,7 +50,7 @@ void SHA1Hash::UpdateBigNumbers(BigNumber* bn0, ...)
     while (bn)
     {
         UpdateData(bn->AsByteArray(), bn->GetNumBytes());
-        bn = va_arg(v, BigNumber* );
+        bn = va_arg(v, BigNumber*);
     }
     va_end(v);
 }