*Merge.

--HG--
branch : trunk

sql/updates/645_world_scripts.sql

@@ -2,5 +2,4 @@ delete from creature where id=17318;
 update creature_template set scriptname='npc_geezle' where entry=17318;
 delete from event_scripts where id=10675;
 insert into event_scripts () VALUES (10675, 0, 10, 17318, 120000, 0, -5134.3, -11250.3, 5.29568, 6.23554), 
-(10675, 72, 7, 9531, 0, 0, 0, 0, 0, 0);
-update quest_template set specialflags=2, reqcreatureorgoid1=0, reqcreatureorgocount1=0 where entry=9531;
+(10675, 72, 7, 9531, 0, 0, 0, 0, 0, 0);

sql/updates/686_world_scripts.sql

@@ -1,4 +1,3 @@
-UPDATE `quest_template` SET `SpecialFlags` = 2 WHERE `entry` = 1144;
 UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE entry=4508;
 
 DELETE FROM script_texts WHERE entry BETWEEN -1047000 and -1047010;

sql/updates/748_world_scripts.sql

@@ -1,3 +1,2 @@
 update creature_template set scriptname='npc_infused_crystal', flags_extra=0 where entry=16364;
-update quest_template set specialflags=2, reqcreatureorgoid1=0, reqcreatureorgocount1=0 where entry=8490;
 delete from creature where id=17086;