Rat eebc468e62 Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x ...

Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h

2015-03-24 20:01:02 +01:00

..

2015_03_15_00_characters.sql

Core/Phases: Ported new phasing system from 4.3.4 branch and fixed some map swap logic

2015-03-16 07:28:49 +01:00