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, 40 deletions

diff --git a/dep/acelite/ace/TSS_Adapter.cpp b/dep/acelite/ace/TSS_Adapter.cpp
deleted file mode 100644
index e51ca303511..00000000000
--- a/dep/acelite/ace/TSS_Adapter.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file TSS_Adapter.cpp
- *
- * $Id: TSS_Adapter.cpp 93792 2011-04-07 11:48:50Z mcorino $
- *
- * Originally in Synch.cpp
- *
- * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-
-#include "ace/TSS_Adapter.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_TSS_Adapter::ACE_TSS_Adapter (void *object, ACE_THR_DEST f)
-  : ts_obj_ (object),
-    func_ (f)
-{
-}
-
-void
-ACE_TSS_Adapter::cleanup (void)
-{
-  (*this->func_)(this->ts_obj_);  // call cleanup routine for ts_obj_
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-extern "C" ACE_Export void
-ACE_TSS_C_cleanup (void *object)
-{
-  if (object != 0)
-    {
-      ACE_TSS_Adapter * const tss_adapter = (ACE_TSS_Adapter *) object;
-      // Perform cleanup on the real TS object.
-      tss_adapter->cleanup ();
-      // Delete the adapter object.
-      delete tss_adapter;
-    }
-}