Merge branch 'master' into publish-runner
authorEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 21 Jul 2011 15:53:52 +0000 (19:53 +0400)
committerEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 21 Jul 2011 15:53:52 +0000 (19:53 +0400)
commit15e032a912662c6b9c0c1f089f79a6fdacad0f40
tree705ba9542c4d5df8b2c09efbc10cf4f29e8f5750
parent2113833f839f5469a4e291eb8978ef652cefa6f3
parentad2457566cbad797606a1cc8a4850b58ffe8c277
Merge branch 'master' into publish-runner

Conflicts:
nuget-common/src/jetbrains/buildServer/nuget/common/PackagesConstants.java
nuget-common/src/jetbrains/buildServer/nuget/common/PackagesConstants.java
nuget-tests/src/testng-nuget-tests..xml