Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist

1 files changed, 0 insertions, 30 deletions

diff --git a/dep/acelite/ace/Hashable.cpp b/dep/acelite/ace/Hashable.cpp
deleted file mode 100644
index 24b2407242f..00000000000
--- a/dep/acelite/ace/Hashable.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//$Id: Hashable.cpp 93736 2011-04-05 12:38:35Z johnnyw $
-
-#include "ace/Hashable.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Hashable.inl"
-#endif /* __ACE_INLINE __ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_Hashable::~ACE_Hashable (void)
-{
-}
-
-unsigned long
-ACE_Hashable::hash (void) const
-{
-  // In doing the check below, we take chance of paying a performance
-  // price when the hash value is zero.  But, that will (hopefully)
-  // happen far less often than a non-zero value, so this caching
-  // strategy should pay off, esp. if hash computation is expensive
-  // relative to the simple comparison.
-
-  if (this->hash_value_ == 0)
-    this->hash_value_ = this->hash_i ();
-
-  return this->hash_value_;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL