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

diff --git a/dep/acelite/ace/Method_Request.h b/dep/acelite/ace/Method_Request.h
deleted file mode 100644
index 156f112472f..00000000000
--- a/dep/acelite/ace/Method_Request.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Method_Request.h
- *
- *  $Id: Method_Request.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *  @author Andres Kruse <Andres.Kruse@cern.ch>
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_METHOD_REQUEST_H
-#define ACE_METHOD_REQUEST_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/Global_Macros.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_Method_Request
- *
- * @brief Reifies a method into a request.  Subclasses must provide
- * the necessary state and behavior.
- *
- * An ACE_Method_Request is inserted in an ACE_Activation_Queue,
- * where it is subsequently removed by a scheduler object (often
- * derived from ACE_Task), which invokes the @c call() method.
- *
- * This class is discussed in depth in the Active Object chapter
- * of POSA2.
- *
- * @sa ACE_Activation_Queue
- */
-class ACE_Export ACE_Method_Request
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  ACE_Method_Request (unsigned long priority = 0);
-
-  /// Destructor.
-  virtual ~ACE_Method_Request (void);
-
-  // = Accessors.
-  /// Get priority.
-  unsigned long priority (void) const;
-
-  /// Set priority.
-  /**
-   * Priority values are user-defined. The default (set in the constructor)
-   * is 0. The priority value is used in the ACE_Activation_Queue::enqueue()
-   * method to order the method requests in the queue by priority.
-   * 0 is the lowest priority.
-   *
-   * @param prio   unsigned long, the new priority value for this object.
-   *
-   * @sa ACE_Activation_Queue::enqueue
-   */
-  void priority (unsigned long prio);
-
-  // = Invocation method (must be overridden by subclasses).
-  /// Invoked by the scheduler to execute the request.
-  /**
-   * This method must be implemented by the subclass to perform the
-   * desired actions.
-   *
-   * @return int; not interpreted by ACE. The scheduler class must
-   *         decide the meaning of this return value and act on it
-   *         if needed.
-   */
-  virtual int call (void) = 0;
-
-private:
-
-  /// Disallow copying and assignment.
-  ACE_Method_Request (const ACE_Method_Request &);
-  void operator= (const ACE_Method_Request &);
-
-protected:
-  /// The priority of the request.
-  unsigned long priority_;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-
-#include /**/ "ace/post.h"
-#endif /* ACE_METHOD_REQUEST_H */