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

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h

2012-08-20 22:04:57 +01:00

..

auth

SQL: Correct SQL errors in an auth update file and character_database.sql (thanks Sinzia/Bio)

2012-08-08 18:53:08 +01:00

characters

DB: Rename characters' void_storage to character_void_storage

2012-08-08 03:42:48 +01:00

world

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

2012-08-20 22:04:57 +01:00