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

diff --git a/dep/acelite/ace/Condition_Attributes.h b/dep/acelite/ace/Condition_Attributes.h
deleted file mode 100644
index 0d53b273285..00000000000
--- a/dep/acelite/ace/Condition_Attributes.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- C++ -*-
-
-//==========================================================================
-/**
- *  @file    Condition_Attributes.h
- *
- *  $Id: Condition_Attributes.h 96077 2012-08-20 08:13:23Z johnnyw $
- *
- *   Moved from Synch.h.
- *
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//==========================================================================
-
-#ifndef ACE_CONDITION_ATTRIBUTES_H
-#define ACE_CONDITION_ATTRIBUTES_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/ACE_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/OS_NS_Thread.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// ACE platform supports some form of threading.
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_Export ACE_Condition_Attributes
-{
-public:
-  /// Constructor
-  ACE_Condition_Attributes (int type = ACE_DEFAULT_SYNCH_TYPE);
-
-  /// Destructor
-  ~ACE_Condition_Attributes (void);
-
-  /// Accessor for retrieving the current attributes
-  const ACE_condattr_t& attributes (void) const;
-
-protected:
-  /// The attributes
-  ACE_condattr_t attributes_;
-
-private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Condition_Attributes &);
-  ACE_Condition_Attributes (const ACE_Condition_Attributes &);
-};
-
-template <class TIME_POLICY>
-class ACE_Condition_Attributes_T : public ACE_Condition_Attributes
-{
-public:
-  /// Constructor
-  ACE_Condition_Attributes_T (int type = ACE_DEFAULT_SYNCH_TYPE)
-    : ACE_Condition_Attributes (type)
-  {}
-
-  /// Destructor
-  ~ACE_Condition_Attributes_T (void) {}
-
-private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Condition_Attributes_T<TIME_POLICY> &);
-  ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<TIME_POLICY> &);
-};
-
-class ACE_Monotonic_Time_Policy;
-
-template <>
-class ACE_Export ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>
-  : public ACE_Condition_Attributes
-{
-public:
-  /// Constructor
-  ACE_Condition_Attributes_T (int type = ACE_DEFAULT_SYNCH_TYPE);
-
-  /// Destructor
-  ~ACE_Condition_Attributes_T (void);
-
-private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &);
-  ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "ace/Condition_Attributes.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* !ACE_HAS_THREADS */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONDITION_ATTRIBUTES_H */