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

diff --git a/dep/acelite/ace/UNIX_Addr.h b/dep/acelite/ace/UNIX_Addr.h
deleted file mode 100644
index 887529fe152..00000000000
--- a/dep/acelite/ace/UNIX_Addr.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    UNIX_Addr.h
- *
- *  $Id: UNIX_Addr.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *  @author Doug Schmidt
- */
-//=============================================================================
-
-
-#ifndef ACE_UNIX_ADDR_H
-#define ACE_UNIX_ADDR_H
-
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/ACE_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "ace/Addr.h"
-#include "ace/Log_Msg.h"
-#include "ace/ACE.h"
-#include "ace/os_include/sys/os_un.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_UNIX_Addr
- *
- * @brief Defines the ``UNIX domain address family'' address format.
- */
-class ACE_Export ACE_UNIX_Addr : public ACE_Addr
-{
-public:
-  // = Initialization methods.
-  /// Default constructor.
-  ACE_UNIX_Addr (void);
-
-  /// Copy constructor.
-  ACE_UNIX_Addr (const ACE_UNIX_Addr &sa);
-
-  /// Creates an ACE_UNIX_Addr from a string.
-  ACE_UNIX_Addr (const char rendezvous_point[]);
-
-  /// Creates an ACE_INET_Addr from a sockaddr_un structure.
-  ACE_UNIX_Addr (const sockaddr_un *, int len);
-
-  /// Creates an ACE_UNIX_Addr from another ACE_UNIX_Addr.
-  int set (const ACE_UNIX_Addr &sa);
-
-  /// Creates an ACE_UNIX_Addr from a string.
-  int set (const char rendezvous_point[]);
-
-  /// Creates an ACE_UNIX_Addr from a sockaddr_un structure.
-  int set (const sockaddr_un *, int len);
-
-  /// Return a pointer to the underlying network address.
-  virtual void *get_addr (void) const;
-
-  /// Set a pointer to the underlying network address.
-  virtual void set_addr (void *addr, int len);
-
-  /// Transform the current address into string format.
-  virtual int addr_to_string (ACE_TCHAR addr[], size_t) const;
-
-  /// Transform the string into the current addressing format.
-  virtual int string_to_addr (const char addr[]);
-
-#if defined (ACE_HAS_WCHAR)
-  /// Creates an ACE_UNIX_Addr from a string.
-  ACE_UNIX_Addr (const wchar_t rendezvous_point[]);
-
-  /// Creates an ACE_UNIX_Addr from a string.
-  int set (const wchar_t rendezvous_point[]);
-#endif /* ACE_HAS_WCHAR */
-
-  /// Compare two addresses for equality.
-  bool operator == (const ACE_UNIX_Addr &SAP) const;
-
-  /// Compare two addresses for inequality.
-  bool operator != (const ACE_UNIX_Addr &SAP) const;
-
-  /// Return the path name of the underlying rendezvous point.
-  const char *get_path_name (void) const;
-
-  /// Computes and returns hash value.
-  virtual u_long hash (void) const;
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-private:
-  /// Underlying socket address.
-  sockaddr_un unix_addr_;
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "ace/UNIX_Addr.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_UNIX_ADDR_H */