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

diff --git a/dep/acelite/ace/FIFO_Recv.cpp b/dep/acelite/ace/FIFO_Recv.cpp
deleted file mode 100644
index 37700ddaf67..00000000000
--- a/dep/acelite/ace/FIFO_Recv.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// $Id: FIFO_Recv.cpp 91286 2010-08-05 09:04:31Z johnnyw $
-
-#include "ace/FIFO_Recv.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_fcntl.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/FIFO_Recv.inl"
-#endif /* __ACE_INLINE__ */
-
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv)
-
-void
-ACE_FIFO_Recv::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_FIFO_Recv::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_FIFO::dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-int
-ACE_FIFO_Recv::close (void)
-{
-  ACE_TRACE ("ACE_FIFO_Recv::close");
-  int result = ACE_FIFO::close ();
-
-  if (this->aux_handle_ != ACE_INVALID_HANDLE)
-    return ACE_OS::close (this->aux_handle_);
-  else
-    return result;
-}
-
-// Note that persistent means "open fifo for writing, as well as
-// reading."  This ensures that the fifo never gets EOF, even if there
-// aren't any writers at the moment!
-
-int
-ACE_FIFO_Recv::open (const ACE_TCHAR *fifo_name,
-                     int flags,
-                     mode_t perms,
-                     int persistent,
-                     LPSECURITY_ATTRIBUTES sa)
-{
-  ACE_TRACE ("ACE_FIFO_Recv::open");
-
-  if (ACE_FIFO::open (fifo_name, ACE_NONBLOCK | flags, perms, sa) == -1)
-    return -1;
-  else if (this->disable (ACE_NONBLOCK) == -1)
-    return -1;
-  else if (persistent
-           && (this->aux_handle_ = ACE_OS::open (fifo_name, O_WRONLY, 0, sa)) == ACE_INVALID_HANDLE)
-    return -1;
-  else
-    return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0;
-}
-
-ACE_FIFO_Recv::ACE_FIFO_Recv (void)
-  : aux_handle_ (ACE_INVALID_HANDLE)
-{
-  ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv");
-}
-
-ACE_FIFO_Recv::ACE_FIFO_Recv (const ACE_TCHAR *fifo_name,
-                              int flags,
-                              mode_t perms,
-                              int persistent,
-                              LPSECURITY_ATTRIBUTES sa)
-  : aux_handle_ (ACE_INVALID_HANDLE)
-{
-  ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv");
-
-  if (this->ACE_FIFO_Recv::open (fifo_name,
-                                 flags,
-                                 perms,
-                                 persistent,
-                                 sa) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO_Recv")));
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL