Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/World/World.h
	src/server/scripts/Kalimdor/moonglade.cpp

1 files changed, 8 insertions, 6 deletions

diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 7fa476100d5..5617c69aea9 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -53,14 +53,16 @@ enum eUnits
     ENTRY_REINFORCED_FEL_IRON_CHEST_H = 185169
 };
 
-enum eSays
+enum Says
 {
     SAY_INTRO                     = 0,
-    SAY_WIPE                      = 1,
-    SAY_AGGRO                     = 2,
-    SAY_KILL                      = 3,
-    SAY_DIE                       = 4,
-    EMOTE                         = 5
+
+    SAY_WIPE                      = 0,
+    SAY_AGGRO                     = 1,
+    SAY_KILL                      = 2,
+    SAY_DIE                       = 3,
+
+    EMOTE                         = 0
 };
 
 const float VazrudenMiddle[3] = {-1406.5f, 1746.5f, 81.2f};