| tag | f33f78c43ca70e83db0b52f48ac26f2fbe042fd5 | |
|---|---|---|
| tagger | Glyn Normington <gnormington@vmware.com> | Tue Apr 17 10:15:54 2012 +0100 |
| object | 95ed883f9ecaa078b362b80ef3ffc8f905b0b5ff |
| commit | 95ed883f9ecaa078b362b80ef3ffc8f905b0b5ff | [log] [tgz] |
|---|---|---|
| author | Christopher Frost <frostc@vmware.com> | Wed Apr 11 11:37:52 2012 +0100 |
| committer | Christopher Frost <frostc@vmware.com> | Wed Apr 11 11:37:52 2012 +0100 |
| tree | f670a0ace0da7e040085225a4cda725c28beb927 | |
| parent | 9ceb7a1cb7a0887232e9084df7f425109786a0a3 [diff] | |
| parent | 84483f2706303807cf0e6141855908c712fcb0ec [diff] |
Merge branch 'master' into 352217-new-admin-console Conflicts: org.eclipse.virgo.apps.admin.core/.classpath org.eclipse.virgo.apps.admin.web/.classpath