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

diff --git a/dep/acelite/ace/DEV_Addr.cpp b/dep/acelite/ace/DEV_Addr.cpp
deleted file mode 100644
index 90bfe0a5752..00000000000
--- a/dep/acelite/ace/DEV_Addr.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id: DEV_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "ace/DEV_Addr.h"
-#if !defined (__ACE_INLINE__)
-#include "ace/DEV_Addr.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Addr)
-
-// Transform the current address into string format.
-
-int
-ACE_DEV_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
-{
-  ACE_TRACE ("ACE_DEV_Addr::addr_to_string");
-
-  ACE_OS::strsncpy (s, this->devname_, len);
-  return 0;
-}
-
-// Return a pointer to the address.
-
-void *
-ACE_DEV_Addr::get_addr (void) const
-{
-  ACE_TRACE ("ACE_DEV_Addr::get_addr");
-
-  return (void *) &this->devname_;
-}
-
-void
-ACE_DEV_Addr::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_DEV_Addr::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("devname_ = %s"), this->devname_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-// Do nothing constructor.
-
-ACE_DEV_Addr::ACE_DEV_Addr (void)
-  : ACE_Addr (AF_DEV, sizeof this->devname_)
-{
-  ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr");
-
-  (void) ACE_OS::memset ((void *) &this->devname_,
-                         0, sizeof this->devname_);
-}
-
-int
-ACE_DEV_Addr::set (const ACE_DEV_Addr &sa)
-{
-  this->base_set (sa.get_type (), sa.get_size ());
-
-  if (sa.get_type () == AF_ANY)
-    (void) ACE_OS::memset ((void *) &this->devname_,
-                           0,
-                           sizeof this->devname_);
-  else
-    (void) ACE_OS::strsncpy (this->devname_,
-                             sa.devname_,
-                             ACE_DEV_Addr::DEVNAME_LENGTH);
-  return 0;
-}
-
-// Copy constructor.
-
-ACE_DEV_Addr::ACE_DEV_Addr (const ACE_DEV_Addr &sa)
-  : ACE_Addr (AF_DEV, sizeof this->devname_)
-{
-  ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr");
-
-  this->set (sa);
-}
-
-ACE_DEV_Addr::ACE_DEV_Addr (const ACE_TCHAR *devname)
-  : ACE_Addr (AF_DEV, sizeof this->devname_)
-{
-  ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr");
-
-  this->set (devname);
-}
-
-ACE_DEV_Addr &
-ACE_DEV_Addr::operator= (const ACE_DEV_Addr &sa)
-{
-  ACE_TRACE ("ACE_DEV_Addr::operator=");
-
-  if (this != &sa)
-    this->set (sa);
-
-  return *this;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL