Merge branch 'master' of git.wowace.com:wow/arl/mainline

diff --git a/Database/Tailoring.lua b/Database/Tailoring.lua
index 50bb8de..56456ca 100644
--- a/Database/Tailoring.lua
+++ b/Database/Tailoring.lua
@@ -2069,6 +2069,11 @@ function addon:InitTailoring()
 	AddRecipe(70553, 450, 49893, Q.EPIC, V.WOTLK, 450, 475, 487, 500)
 	self:AddRecipeFlags(70553, F.ALLIANCE, F.HORDE, F.VENDOR, F.RBOP, F.IBOE, F.HEALER, F.CASTER, F.CLOTH, F.ASHEN_VERDICT)
 	self:AddRecipeAcquire(70553, A.REPUTATION, FAC.ASHEN_VERDICT, REP.HONORED, 37687)
+
+	-- Frosty Flying Carpet 75597
+	AddRecipe(75597, 450, 54797, Q.EPIC, V.WOTLK, 450, 475, 487, 500)
+	self:AddRecipeFlags(75597, F.ALLIANCE, F.HORDE, F.VENDOR, F.RBOP, F.IBOE)
+	self:AddRecipeAcquire(75597, A.VENDOR, 40160)

 	-- Some recipes are only availible to specific factions.
 	-- We only add the faction specific recipes if the user is part of that faction
diff --git a/Database/Vendor.lua b/Database/Vendor.lua
index 7da260f..429ba14 100644
--- a/Database/Vendor.lua
+++ b/Database/Vendor.lua
@@ -383,5 +383,6 @@ function addon:InitVendor(DB)
 	self:addLookupList(DB, 34039, L["Lady Palanseer"], BZ["Orgrimmar"], 37.0, 64.9, 2)
 	self:addLookupList(DB, 34079, L["Captain O'Neal"], BZ["Stormwind City"], 75.7, 66.6, 1)
 	self:addLookupList(DB, 37687, L["Alchemist Finklestein"], BZ["Icecrown Citadel"], 0, 0, 0)
+	self:addLookupList(DB, 40160, L["Frozo the Renowned"], BZ["Dalaran"], 41.0, 28.5, 0)

 end
diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua
index 8e5349f..1a48530 100644
--- a/Locales/devel-enUS.lua
+++ b/Locales/devel-enUS.lua
@@ -788,6 +788,7 @@ L["Frostbrood Spawn"] = true
 L["Frostfeather Screecher"] = true
 L["Frostfeather Witch"] = true
 L["Frostmaul Giant"] = true
+L["Frozo the Renowned"] = true
 L["Fyldan"] = true
 L["Gagsprocket"] = true
 L["Gambarinka"] = true