Spp 1b6fb2b695 Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review) ...

Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Movement/Spline/MovementTypedefs.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
	src/server/scripts/Spells/spell_generic.cpp

2013-05-21 09:41:13 +02:00

..

auth_database.sql

Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review)

2013-05-21 09:41:13 +02:00

characters_database.sql

Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review)

2013-05-21 09:41:13 +02:00