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

diff --git a/dep/acelite/ace/Encoding_Converter.h b/dep/acelite/ace/Encoding_Converter.h
deleted file mode 100644
index 34d22fa29a1..00000000000
--- a/dep/acelite/ace/Encoding_Converter.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-//=========================================================================
-/**
- * @file Encoding_Converter.h
- *
- * $Id: Encoding_Converter.h 80826 2008-03-04 14:51:23Z wotte $
- *
- * This class is the base class for all encoding converters that convert
- * to and from UTF-8.
- *
- * @author Chad Elliott <elliott_c@ociweb.com>
- */
-//=========================================================================
-
-#ifndef ACE_ENCODING_CONVERTER_H
-#define ACE_ENCODING_CONVERTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Basic_Types.h"
-
-#if defined (ACE_USES_WCHAR)
-#include /**/ "ace/ACE_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/** The base class for all ACE UTF Encoding Converters.
- * This class provides a generic interface that is used to implement
- * various UTF encoding conversion classes.
- */
-class ACE_Export ACE_Encoding_Converter
-{
-public:
-  /// This enum describes the various states that can be returned
-  /// from the to_utf8() and from_utf8() methods which depends on
-  /// both the source buffer and the size of the target buffer.
-  enum Result {CONVERSION_OK,
-               SOURCE_EXHAUSTED,
-               TARGET_EXHAUSTED,
-               SOURCE_ILLEGAL
-              };
-
-  /// This destructor is here (and virtual) because we have virtual
-  /// functions.
-  virtual ~ACE_Encoding_Converter (void);
-
-  /// Convert the source (which can be in any encoding) to UTF-8 and
-  /// store it in the provided target buffer.
-  virtual Result to_utf8 (const void* source,
-                          size_t source_size,
-                          ACE_Byte* target,
-                          size_t target_size,
-                          bool strict = true) = 0;
-
-  /// Convert the UTF-8 source into an alternate encoding and store it
-  /// in the provided target buffer.
-  virtual Result from_utf8 (const ACE_Byte* source,
-                            size_t source_size,
-                            void* target,
-                            size_t target_size,
-                            bool strict = true) = 0;
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-#endif /* ACE_USES_WCHAR */
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_ENCODING_CONVERTER_H */