Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/shared/Packets/ByteBuffer.h

1 files changed, 3 insertions, 6 deletions

diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
index 37778cceab8..06ea57b662e 100644
--- a/src/server/shared/Cryptography/BigNumber.cpp
+++ b/src/server/shared/Cryptography/BigNumber.cpp
@@ -24,18 +24,15 @@
 #include <algorithm>
 
 BigNumber::BigNumber()
-    : _bn(BN_new())
-    , _array(NULL)
+    : _bn(BN_new()), _array(NULL)
 { }
 
 BigNumber::BigNumber(BigNumber const& bn)
-    : _bn(BN_dup(bn._bn))
-    , _array(NULL)
+    : _bn(BN_dup(bn._bn)), _array(NULL)
 { }
 
 BigNumber::BigNumber(uint32 val)
-    : _bn(BN_new())
-    , _array(NULL)
+    : _bn(BN_new()), _array(NULL)
 {
     BN_set_word(_bn, val);
 }