tree e38d4cc152efe836201b6d64c7adbe9c90869a83
parent dec395628d1f26d0bac4a6c8fb50f33e60eea9a9
parent b117dfb8c14a050efe33e20ecc4e96039608be0a
author Christopher Frost <frostc@vmware.com> 1342082075 +0100
committer Christopher Frost <frostc@vmware.com> 1342082075 +0100

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

Conflicts:
	scripts/releaselor/releaselor.rb