Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp

2 files changed, 17 insertions, 0 deletions

diff --git a/sql/updates/world/2013_09_06_00_world_misc.sql b/sql/updates/world/2013_09_06_00_world_misc.sql
new file mode 100644
index 00000000000..872dc840a8b
--- /dev/null
+++ b/sql/updates/world/2013_09_06_00_world_misc.sql
@@ -0,0 +1,4 @@
+-- Fix few startup errors
+UPDATE `smart_scripts` SET `event_param3`=12555 WHERE `entryorguid`=27727 AND `source_type`=0 AND `id`=2 AND `link`=0;
+DELETE FROM `creature_addon` WHERE `guid`=66177;
+DELETE FROM `waypoint_data` WHERE `id`=661770;
diff --git a/sql/updates/world/2013_09_06_01_world_misc.sql b/sql/updates/world/2013_09_06_01_world_misc.sql
new file mode 100644
index 00000000000..10533e8354c
--- /dev/null
+++ b/sql/updates/world/2013_09_06_01_world_misc.sql
@@ -0,0 +1,13 @@
+DELETE FROM `smart_scripts` WHERE `entryorguid`=28481 AND `source_type`=0;
+UPDATE `creature_template` SET `AIName`='' WHERE `entry`=28481;
+
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (51769,51770,58941);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES 
+(51769,'spell_q12619_emblazon_runeblade'),
+(51770,'spell_q12619_emblazon_runeblade_effect'),
+(58941,'spell_archavon_rock_shards');
+
+DELETE FROM `spelldifficulty_dbc` WHERE `id` IN (58695,58696);
+INSERT INTO `spelldifficulty_dbc`(`id`,`spellid0`,`spellid1`) VALUES 
+(58695,58695,60883),
+(58696,58696,60884);