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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/worldserver/worldserver.conf.dist

2012-08-18 17:13:46 +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-18 17:13:46 +01:00