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

diff --git a/dep/acelite/ace/DEV_Addr.h b/dep/acelite/ace/DEV_Addr.h
deleted file mode 100644
index 49ec5023a7c..00000000000
--- a/dep/acelite/ace/DEV_Addr.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-//==========================================================================
-/**
- *  @file    DEV_Addr.h
- *
- *  $Id: DEV_Addr.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *  @author Gerhard Lenzer and Douglas C. Schmidt
- */
-//==========================================================================
-
-#ifndef ACE_DEV_ADDR_H
-#define ACE_DEV_ADDR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Addr.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/os_include/os_dirent.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_DEV_Addr
- *
- * @brief Defines device address family address format.
- */
-class ACE_Export ACE_DEV_Addr : public ACE_Addr
-{
-public:
-  // = Initialization methods.
-  /// Default constructor.
-  ACE_DEV_Addr (void);
-
-  /// Copy constructor.
-  ACE_DEV_Addr (const ACE_DEV_Addr &sa);
-
-  /// Acts like a copy constructor.
-  int set (const ACE_DEV_Addr &sa);
-
-  /// Create a ACE_DEV_Addr from a device name.
-  explicit ACE_DEV_Addr (const ACE_TCHAR *devname);
-
-  /// Create a ACE_Addr from a ACE_DEV pathname.
-  void set (const ACE_TCHAR *devname);
-
-  /// Assignment operator.
-  ACE_DEV_Addr &operator= (const ACE_DEV_Addr &);
-
-  /// Return a pointer to the address.
-  virtual void *get_addr (void) const;
-
-  /// Transform the current address into string format.
-  virtual int addr_to_string (ACE_TCHAR *addr, size_t) const;
-
-  /// Compare two addresses for equality.
-  bool operator == (const ACE_DEV_Addr &SAP) const;
-
-  /// Compare two addresses for inequality.
-  bool operator != (const ACE_DEV_Addr &SAP) const;
-
-  /// Return the path name used for the rendezvous point.
-  const ACE_TCHAR *get_path_name (void) const;
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-private:
-  enum { DEVNAME_LENGTH = MAXPATHLEN + 1 };
-  /// Name of the device.
-  ACE_TCHAR devname_[DEVNAME_LENGTH];
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "ace/DEV_Addr.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_DEV_ADDR_H */