Nay a7527b3b48 Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/tools/map_extractor/mpq_libmpq04.h

2013-08-25 14:12:32 +01:00

..

auth_database.sql

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-08-25 14:12:32 +01:00

characters_database.sql

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

2013-07-19 22:33:35 +02:00