tree bf519ec84e69a51066976d48f4b9cb8bb0172a77
parent 827fa315ec4e45d3196d424c2a7cc956d0fdbc39
parent 850fa73c783f7921f24d6346551affa0f0d3985c
author Borislav Kapukaranov <b.kapukaranov@gmail.com> 1344113412 +0300
committer Borislav Kapukaranov <b.kapukaranov@gmail.com> 1344113412 +0300

Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.test into 380765-shared-ivycache

Conflicts:
	org.eclipse.virgo.test.framework/ivy.xml