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

diff --git a/dep/acelite/ace/Null_Condition.h b/dep/acelite/ace/Null_Condition.h
deleted file mode 100644
index 9a1e47ec093..00000000000
--- a/dep/acelite/ace/Null_Condition.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-
-//==========================================================================
-/**
- *  @file    Null_Condition.h
- *
- *  $Id: Null_Condition.h 96076 2012-08-18 19:26:00Z johnnyw $
- *
- *   Moved from Synch.h.
- *
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//==========================================================================
-
-#ifndef ACE_NULL_CONDITION_H
-#define ACE_NULL_CONDITION_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Null_Mutex.h"
-#include "ace/Condition_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/os_include/os_errno.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_Time_Value;
-class ACE_Condition_Attributes;
-template <class MUTEX> class ACE_Condition;
-
-/**
- * @brief ACE_Condition template specialization written using
- * ACE_Null_Mutexes. Implements a do nothing ACE_Condition
- * specialization, i.e., all methods are no ops.
- */
-template <>
-class ACE_Condition<ACE_Null_Mutex>
-{
-public:
-  ACE_Condition (const ACE_Null_Mutex &m,
-                 const ACE_TCHAR * = 0,
-                 void * = 0)
-    : mutex_ ((ACE_Null_Mutex &) m) {}
-
-  ACE_Condition (const ACE_Null_Mutex &m,
-                 const ACE_Condition_Attributes &,
-                 const ACE_TCHAR * = 0,
-                 void * = 0)
-  : mutex_ ((ACE_Null_Mutex &) m) {}
-
-  ~ACE_Condition (void) {}
-
-  /// Returns 0.
-  int remove (void) {return 0;}
-
-  /// Returns -1 with @c errno == @c ETIME.
-  int wait (const ACE_Time_Value * = 0) {errno = ETIME; return -1;}
-
-  /// Returns -1 with @c errno == @c ETIME.
-  int wait (ACE_Null_Mutex &,
-            const ACE_Time_Value * = 0) {errno = ETIME; return -1;}
-
-  /// Returns 0.
-  int signal (void) {return 0;}
-
-  /// Returns 0.
-  int broadcast (void) {return 0;}
-  ACE_Null_Mutex &mutex (void) {return this->mutex_;};
-
-  /// Dump the state of an object.
-  void dump (void) const {}
-
-  // ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-protected:
-  ACE_Null_Mutex &mutex_; // Reference to mutex lock.
-
-private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Condition<ACE_Null_Mutex> &);
-  ACE_Condition (const ACE_Condition<ACE_Null_Mutex> &);
-};
-
-typedef ACE_Condition<ACE_Null_Mutex> ACE_Null_Condition;
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_NULL_CONDITION_H */