tree 809d93826689c2724485e7faba8b37679ec92a9e
parent d612874a59cdcca94c3f60e681dda8ea1493f3fe
parent 6fe717e408137f93c0c6ee618fdc2ce445818029
author Christopher Frost <frostc@vmware.com> 1345038485 +0100
committer Christopher Frost <frostc@vmware.com> 1345038485 +0100

Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server

Conflicts:
	build.versions