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

diff --git a/dep/acelite/ace/Dynamic_Service.cpp b/dep/acelite/ace/Dynamic_Service.cpp
deleted file mode 100644
index 28d6e4526f2..00000000000
--- a/dep/acelite/ace/Dynamic_Service.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id: Dynamic_Service.cpp 80826 2008-03-04 14:51:23Z wotte $
-
-#ifndef ACE_DYNAMIC_SERVICE_CPP
-#define ACE_DYNAMIC_SERVICE_CPP
-
-#include "ace/Dynamic_Service.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Dynamic_Service.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-template <class TYPE> TYPE *
-ACE_Dynamic_Service<TYPE>::instance (const ACE_TCHAR *name)
-{
-  ACE_Service_Object * svc_obj =
-    static_cast<ACE_Service_Object *>
-    (ACE_Dynamic_Service_Base::instance (name,false));
-  return dynamic_cast<TYPE *> (svc_obj);
-}
-
-template <class TYPE> TYPE *
-ACE_Dynamic_Service<TYPE>::instance (const ACE_TCHAR *name,
-                                     bool no_global)
-{
-  ACE_Service_Object * svc_obj =
-    static_cast<ACE_Service_Object *>
-    (ACE_Dynamic_Service_Base::instance (name, no_global));
-  return dynamic_cast<TYPE *> (svc_obj);
-}
-
-template <class TYPE> TYPE *
-ACE_Dynamic_Service<TYPE>::instance (const ACE_Service_Gestalt* conf,
-                                     const ACE_TCHAR *name)
-{
-  ACE_Service_Object * svc_obj =
-    static_cast<ACE_Service_Object *>
-    (ACE_Dynamic_Service_Base::instance (conf, name, false));
-  return dynamic_cast<TYPE *> (svc_obj);
-}
-
-template <class TYPE> TYPE *
-ACE_Dynamic_Service<TYPE>::instance (const ACE_Service_Gestalt* conf,
-                                     const ACE_TCHAR *name,
-                                     bool no_global)
-{
-  ACE_Service_Object * svc_obj =
-    static_cast<ACE_Service_Object *>
-    (ACE_Dynamic_Service_Base::instance (conf, name, no_global));
-  return dynamic_cast<TYPE *> (svc_obj);
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_DYNAMIC_SERVICE_CPP */