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

diff --git a/dep/acelite/ace/Node.cpp b/dep/acelite/ace/Node.cpp
deleted file mode 100644
index b1b36fd73d2..00000000000
--- a/dep/acelite/ace/Node.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// $Id: Node.cpp 81624 2008-05-06 17:14:57Z wotte $
-
-#ifndef ACE_NODE_CPP
-#define ACE_NODE_CPP
-
-#include "ace/Node.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Node)
-
-template <class T, class C>
-ACE_Node<T, C>::~ACE_Node (void)
-{
-}
-
-template <class T, class C>
-ACE_Node<T, C>::ACE_Node (const T &i, ACE_Node<T, C> *n)
-  : next_ (n),
-    item_ (i)
-{
-  // ACE_TRACE ("ACE_Node<T, C>::ACE_Node");
-}
-
-template <class T, class C>
-ACE_Node<T, C>::ACE_Node (ACE_Node<T, C> *n, int)
-  : next_ (n)
-{
-  // ACE_TRACE ("ACE_Node<T, C>::ACE_Node");
-}
-
-template <class T, class C>
-ACE_Node<T, C>::ACE_Node (const ACE_Node<T, C> &s)
-  : next_ (s.next_),
-    item_ (s.item_)
-{
-  // ACE_TRACE ("ACE_Node<T, C>::ACE_Node");
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_NODE_CPP */