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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_druid.cpp
This commit is contained in:
Nay committed 2012-09-17 23:49:13 +01:00
commit 6568b0624d
566 files changed
+29934 -14984

No files matched your search

File diff suppressed because it is too large. Load diff