Fixed Rebase merge error
Fixed Rebase merge error

--HG--
branch : 1.2
extra : rebase_source : 9a13f758efd76b36c1a0024ef9271a8946d13457

mrward/NuGet.V2,dolkensp/node.net,mrward/NuGet.V2,OneGet/nuget,GearedToWar/NuGet2,alluran/node.net,jmezach/NuGet2,xero-github/Nuget,zskullz/nuget,GearedToWar/NuGet2,indsoft/NuGet2,OneGet/nuget,chocolatey/nuget-chocolatey,antiufo/NuGet2,themotleyfool/NuGet,pratikkagda/nuget,mrward/nuget,GearedToWar/NuGet2,mono/nuget,xoofx/NuGet,chocolatey/nuget-chocolatey,jholovacs/NuGet,rikoe/nuget,ctaggart/nuget,chocolatey/nuget-chocolatey,RichiCoder1/nuget-chocolatey,antiufo/NuGet2,mrward/nuget,oliver-feng/nuget,rikoe/nuget,mrward/nuget,jholovacs/NuGet,oliver-feng/nuget,alluran/node.net,GearedToWar/NuGet2,xoofx/NuGet,atheken/nuget,anurse/NuGet,pratikkagda/nuget,jholovacs/NuGet,pratikkagda/nuget,rikoe/nuget,alluran/node.net,jmezach/NuGet2,kumavis/NuGet,mrward/nuget,OneGet/nuget,OneGet/nuget,antiufo/NuGet2,dolkensp/node.net,dolkensp/node.net,indsoft/NuGet2,chester89/nugetApi,jmezach/NuGet2,mono/nuget,indsoft/NuGet2,indsoft/NuGet2,atheken/nuget,chocolatey/nuget-chocolatey,xoofx/NuGet,xoofx/NuGet,oliver-feng/nuget,GearedToWar/NuGet2,jmezach/NuGet2,pratikkagda/nuget,zskullz/nuget,dolkensp/node.net,indsoft/NuGet2,oliver-feng/nuget,mono/nuget,kumavis/NuGet,RichiCoder1/nuget-chocolatey,chocolatey/nuget-chocolatey,antiufo/NuGet2,oliver-feng/nuget,RichiCoder1/nuget-chocolatey,GearedToWar/NuGet2,chocolatey/nuget-chocolatey,mrward/NuGet.V2,jholovacs/NuGet,antiufo/NuGet2,themotleyfool/NuGet,chester89/nugetApi,zskullz/nuget,jholovacs/NuGet,mono/nuget,mrward/nuget,akrisiun/NuGet,mrward/NuGet.V2,antiufo/NuGet2,RichiCoder1/nuget-chocolatey,indsoft/NuGet2,zskullz/nuget,akrisiun/NuGet,RichiCoder1/nuget-chocolatey,mrward/NuGet.V2,themotleyfool/NuGet,anurse/NuGet,pratikkagda/nuget,jmezach/NuGet2,ctaggart/nuget,mrward/NuGet.V2,mrward/nuget,rikoe/nuget,jmezach/NuGet2,ctaggart/nuget,pratikkagda/nuget,oliver-feng/nuget,xoofx/NuGet,xoofx/NuGet,jholovacs/NuGet,ctaggart/nuget,RichiCoder1/nuget-chocolatey,alluran/node.net