9ceb7a1cb7a0887232e9084df7f425109786a0a3 - gerrit/virgo/org.eclipse.virgo.apps

commit	9ceb7a1cb7a0887232e9084df7f425109786a0a3	[log] [tgz]
author	Christopher Frost <frostc@vmware.com>	Mon Mar 26 13:39:28 2012 +0100
committer	Christopher Frost <frostc@vmware.com>	Mon Mar 26 13:39:28 2012 +0100
tree	85131af601d9a19695ba6e024d14b15330802be9
parent	35d10e536b113eafea1a3c295488ac945aae49e6 [diff]
parent	02157f23af5247ea87cf0cd74dd03c79384bf1f0 [diff]

Merge branch 'master' into 352217-new-admin-console

Conflicts:
	build.versions
	org.eclipse.virgo.apps.admin.core/.classpath
	org.eclipse.virgo.apps.admin.core/ivy.xml
	org.eclipse.virgo.apps.admin.web/.classpath
	org.eclipse.virgo.apps.admin.web/ivy.xml
	org.eclipse.virgo.apps.admin.web/template.mf
	org.eclipse.virgo.apps.repository.core/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
	org.eclipse.virgo.apps.repository.test/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
	org.eclipse.virgo.apps.repository.web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
	org.eclipse.virgo.apps.splash/.settings/org.eclipse.virgo.ide.bundlor.core.prefs

tree: 85131af601d9a19695ba6e024d14b15330802be9