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

diff --git a/dep/acelite/ace/Module.inl b/dep/acelite/ace/Module.inl
deleted file mode 100644
index 3081bed3925..00000000000
--- a/dep/acelite/ace/Module.inl
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: Module.inl 96061 2012-08-16 09:36:07Z mcorino $
-
-#include "ace/OS_NS_string.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE void *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg (void) const
-{
-  ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg");
-  return this->arg_;
-}
-
-template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE void
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg (void *a)
-{
-  ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg");
-  this->arg_ = a;
-}
-
-template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE const ACE_TCHAR *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name (void) const
-{
-  ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name");
-  return this->name_;
-}
-
-template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE void
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name (const ACE_TCHAR *n)
-{
-  ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name");
-  ACE_OS::strsncpy (this->name_, n, MAXPATHLEN);
-}
-
-template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::writer (void)
-{
-  ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::writer");
-  return this->q_pair_[1];
-}
-
-template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::reader (void)
-{
-  ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::reader");
-  return this->q_pair_[0];
-}
-
-template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next (void)
-{
-  ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next");
-  return this->next_;
-}
-
-template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE void
-ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next (ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *m)
-{
-  ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next");
-  this->next_ = m;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL