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

diff --git a/dep/acelite/ace/Node.h b/dep/acelite/ace/Node.h
deleted file mode 100644
index 57433a70e47..00000000000
--- a/dep/acelite/ace/Node.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Node.h
- *
- *  $Id: Node.h 81624 2008-05-06 17:14:57Z wotte $
- *
- *  @author Doug Schmidt
- */
-//=============================================================================
-
-
-#ifndef ACE_NODE_H
-#define ACE_NODE_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Forward declarations.
-template <class T, class C> class ACE_Unbounded_Set_Ex;
-template <class T, class C> class ACE_Unbounded_Set_Ex_Iterator;
-template <class T, class C> class ACE_Unbounded_Set_Ex_Const_Iterator;
-template <class T> class ACE_Unbounded_Queue;
-template <class T> class ACE_Unbounded_Queue_Iterator;
-template <class T> class ACE_Unbounded_Queue_Const_Iterator;
-template <class T> class ACE_Unbounded_Stack;
-template <class T> class ACE_Unbounded_Stack_Iterator;
-
-/**
- * @class ACE_Node
- *
- * @brief Implementation element in a Queue, Set, and Stack.
- */
-template<class T, class C = void>
-class ACE_Node
-{
-public:
-  friend class ACE_Unbounded_Queue<T>;
-  friend class ACE_Unbounded_Queue_Iterator<T>;
-  friend class ACE_Unbounded_Queue_Const_Iterator<T>;
-  friend class ACE_Unbounded_Set_Ex<T, C>;
-  friend class ACE_Unbounded_Set_Ex_Iterator<T, C>;
-  friend class ACE_Unbounded_Set_Ex_Const_Iterator<T, C>;
-  friend class ACE_Unbounded_Stack<T>;
-  friend class ACE_Unbounded_Stack_Iterator<T>;
-
-  /// This isn't necessary, but it keeps some compilers happy.
-  ~ACE_Node (void);
-
-private:
-  // = Initialization methods
-  ACE_Node (const T &i, ACE_Node<T, C> *n);
-  ACE_Node (ACE_Node<T, C> *n = 0, int = 0);
-  ACE_Node (const ACE_Node<T, C> &n);
-private:
-  /// Not possible
-  void operator= (const ACE_Node<T, C> &);
-
-private:
-  /// Pointer to next element in the list of ACE_Nodes.
-  ACE_Node<T, C> *next_;
-
-  /// Current value of the item in this node.
-  T item_;
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Node.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Node.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_NODE_H */