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

diff --git a/dep/acelite/ace/Codecs.h b/dep/acelite/ace/Codecs.h
deleted file mode 100644
index 2c4227dd0ad..00000000000
--- a/dep/acelite/ace/Codecs.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Codecs.h
- *
- *  $Id: Codecs.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *  @author Krishnakumar B <kitty@cs.wustl.edu>
- *
- *  Codecs is a generic wrapper for various encoding and decoding
- *  mechanisms. Currently it includes Base64 content transfer-encoding as
- *  specified by RFC 2045, Multipurpose Internet Mail Extensions (MIME) Part
- *  One: Format of Internet Message Bodies.
- *
- */
-//=============================================================================
-
-#ifndef ACE_CODECS_H
-#define ACE_CODECS_H
-
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/ACE_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Basic_Types.h"
-#include "ace/Global_Macros.h"
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_Base64
- *
- * @brief Encode/Decode a stream of bytes according to Base64 encoding.
- *
- * This class provides methods to encode or decode a stream of bytes
- * to/from Base64 encoding. It doesn't convert the input stream to a
- * canonical form before encoding.
- *
- */
-class ACE_Export ACE_Base64
-{
-public:
-
-  //@{
-
-  /**
-   * Encodes a stream of bytes to Base64 data
-   *
-   * @param input Binary data in byte stream.
-   * @param input_len Length of the byte stream.
-   * @param output_len Length of the encoded Base64 byte stream.
-   * @param is_chunked If true, terminate 72 character blocks with newline
-   * @return Encoded Base64 data in byte stream or NULL if input data cannot
-   *         be encoded.
-   */
-
-  static ACE_Byte* encode (const ACE_Byte* input,
-                           const size_t input_len,
-                           size_t* output_len,
-                           bool is_chunked = true);
-  /**
-   * Decodes a stream of Base64 to bytes data
-   *
-   * @param input Encoded Base64 data in byte stream.
-   * @param output_len Length of the binary byte stream.
-   * @return Binary data in byte stream or NULL if input data cannot
-   *         be encoded.
-   */
-  static ACE_Byte* decode (const ACE_Byte* input,
-                           size_t* output_len);
-
-  /**
-   * Return the length of the encoded input data
-   *
-   * @param input Encoded Base64 data in byte stream.
-   * @return Length of the encoded Base64 data.
-   *
-   */
-  static size_t length (const ACE_Byte* input);
-
-  //@}
-
-protected:
-
-  // Prevent default construction.
-  ACE_Base64 (void) {}
-
-private:
-
-  // Preventing copying and assignment.
-  ACE_Base64 (ACE_Base64 const &);
-  ACE_Base64 & operator= (ACE_Base64 const &);
-
-  /// Initialize the tables for encoding/decoding.
-  static void init (void);
-
-private:
-
-  /// Alphabet used for decoding i.e decoder_[alphabet_[i = 0..63]] = i
-  static ACE_Byte decoder_[];
-
-  /// Alphabet used to check valid range of encoded input i.e
-  /// member_[alphabet_[0..63]] = 1
-  static ACE_Byte member_[];
-
-  /// Boolean to denote whether initialization is complete
-  static bool init_;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_CODECS_H */