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

diff --git a/dep/acelite/ace/Unbounded_Set.h b/dep/acelite/ace/Unbounded_Set.h
deleted file mode 100644
index 1655609517f..00000000000
--- a/dep/acelite/ace/Unbounded_Set.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Unbounded_Set.h
- *
- *  $Id: Unbounded_Set.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACE_UNBOUNDED_SET_H
-#define ACE_UNBOUNDED_SET_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Unbounded_Set_Ex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_Allocator;
-
-/**
- * @struct ACE_Unbounded_Set_Default_Comparator
- * @brief Simple comparator that evaluates equality using == operator.
- */
-template<typename T>
-struct ACE_Unbounded_Set_Default_Comparator
-{
-  bool operator() (const T&lhs, const T&rhs) const;
-};
-
-template<typename T>
-class ACE_Unbounded_Set;
-
-/**
- * @class ACE_Unbounded_Set_Iterator
- * @brief Compatibility wrapper for ACE_Unbounded_Set_Ex_Iterator.
- */
-template <typename T>
-class ACE_Unbounded_Set_Iterator : public
-  ACE_Unbounded_Set_Ex_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> >
-{
-public:
-  typedef ACE_Unbounded_Set_Ex_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> > base_type;
-
-  // = Initialization method.
-  ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, bool end = false);
-
-  ACE_Unbounded_Set_Iterator (const base_type &s);
-};
-
-/**
- * @class ACE_Unbounded_Set_Const_Iterator
- * @brief Compatibility wrapper for ACE_Unbounded_Set_Ex_Const_Iterator.
- */
-template <class T>
-class ACE_Unbounded_Set_Const_Iterator : public
-  ACE_Unbounded_Set_Ex_Const_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> >
-{
-public:
-
-  typedef ACE_Unbounded_Set_Ex_Const_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> > base_type;
-
-  // = Initialization method.
-  ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set<T> &s,
-                                    bool end = false);
-
-  ACE_Unbounded_Set_Const_Iterator (const base_type &s);
-};
-
-/**
- * @class ACE_Unbounded_Set
- * @brief Compatibility wrapper for ACE_Unbounded_Set_Ex.
- */
-template<typename T>
-class ACE_Unbounded_Set : public
-  ACE_Unbounded_Set_Ex<T, ACE_Unbounded_Set_Default_Comparator<T> >
-{
-public:
-  ACE_Unbounded_Set (ACE_Allocator *alloc = 0);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "ace/Unbounded_Set.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Unbounded_Set.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Unbounded_Set.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_UNBOUNDED_SET_H */