*Merge.

--HG--
branch : trunk

sql/updates/965_world_scripts.sql

@@ -1,4 +1,4 @@
-INSERT INTO `spell_script_target` VALUES
+REPLACE INTO `spell_script_target` VALUES
 (33655,0,183350),
 (33655,0,183351),
 (44374,1,24722),

sql/updates/973_world_scripts.sql

@@ -0,0 +1 @@
+update creature_template set scriptname = 'npc_enraged_spirit' where entry in (21050, 21061, 21060, 21059);

sql/updates/CMakeLists.txt

@@ -161,4 +161,5 @@ INSTALL(FILES
 965_world_scripts.sql
 966_world_scripts.sql
 970_world_scripts.sql
+973_world_scripts.sql
 DESTINATION share/trinity/sql/updates)