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

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceScript.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/OutdoorPvP/OutdoorPvP.h
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellInfo.h

2012-09-11 01:11:14 +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

Rename SQL and update characters_database.sql

2012-09-10 11:56:37 +01:00

world

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

2012-09-11 01:11:14 +01:00