resolve merge conflicts
[teamcity/dotNetPackagesSupport.git] / nuget-common / nuget-common.iml
2011-07-06 Eugene.Petrenkocreate agent and shared modules, add plugin.zip artifact