Vincent_Michael cc85d1b5b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/World/npcs_special.cpp
	src/server/worldserver/worldserver.conf.dist

2014-01-13 20:34:21 +01:00

..

auth_database.sql

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-12-08 20:27:46 +01:00

characters_database.sql

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-01-13 20:34:21 +01:00