d7a5f75a2c2ffac5bc6aeb894c82a91cacead310 - virgo/org.eclipse.virgo.web-server

commit: d7a5f75a2c2ffac5bc6aeb894c82a91cacead310
[log]
author: Christopher Frost <frostc@vmware.com>
Thu Jul 12 09:34:35 2012 +0100
committer: Christopher Frost <frostc@vmware.com>
Thu Jul 12 09:34:35 2012 +0100
tree: e38d4cc152efe836201b6d64c7adbe9c90869a83
parent: dec395628d1f26d0bac4a6c8fb50f33e60eea9a9 [diff]
parent: b117dfb8c14a050efe33e20ecc4e96039608be0a [diff]

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

Conflicts:
	scripts/releaselor/releaselor.rb

tree: e38d4cc152efe836201b6d64c7adbe9c90869a83