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

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp

1 files changed, 14 insertions, 0 deletions

diff --git a/sql/updates/world/2013_07_14_01_world_item_template.sql b/sql/updates/world/2013_07_14_01_world_item_template.sql
new file mode 100644
index 00000000000..ab372605f4b
--- /dev/null
+++ b/sql/updates/world/2013_07_14_01_world_item_template.sql
@@ -0,0 +1,14 @@
+UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=23614;
+UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=28635;
+UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=28636;
+UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=28637;
+UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=30503;
+UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=34868;
+UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=37020;
+UPDATE `item_template` SET `Flags`=0x80010000 WHERE `entry`=37200;
+UPDATE `item_template` SET `Flags`=0x80000040 WHERE `entry`=40652;
+UPDATE `item_template` SET `Flags`=0x80000040 WHERE `entry`=40970;
+UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=41843;
+UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=42782;
+
+ALTER TABLE `item_template` CHANGE `Flags` `Flags` int(10) unsigned NOT NULL DEFAULT '0';