Merge branch 'pack-runner' into v0.5-bugfix
authorEugene.Petrenko <eugene.petrenko@gmail.com>
Tue, 23 Aug 2011 16:16:36 +0000 (18:16 +0200)
committerEugene.Petrenko <eugene.petrenko@gmail.com>
Tue, 23 Aug 2011 16:16:36 +0000 (18:16 +0200)
commit46d7de222c982429f9179ed893742d2780722016
tree5595a04a4b6d177cee1c48e8502f75229a11b8db
parent322d782640fd60836abf1b433eb9b27c2478c0f6
parent9c9f8c1f9ae0864f931d6c431b963d692167d249
Merge branch 'pack-runner' into v0.5-bugfix

Conflicts:
nuget-server/resources/tool/runnerSettings.jsp
nuget-server/resources/tool/runnerSettings.jsp