commit | f85d48997f8b576ad1b963eb8a91931afb86687a | [log] [tgz] |
---|---|---|
author | Christopher Frost <frostc@vmware.com> | Wed Aug 15 14:48:05 2012 +0100 |
committer | Christopher Frost <frostc@vmware.com> | Wed Aug 15 14:48:05 2012 +0100 |
tree | 809d93826689c2724485e7faba8b37679ec92a9e | |
parent | d612874a59cdcca94c3f60e681dda8ea1493f3fe [diff] | |
parent | 6fe717e408137f93c0c6ee618fdc2ce445818029 [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server Conflicts: build.versions