| commit | e8878c8c51087988870f376c48f97a768433cf5b | [log] [tgz] |
|---|---|---|
| author | Glyn Normington <gnormington@vmware.com> | Fri Mar 23 14:36:52 2012 +0000 |
| committer | Glyn Normington <gnormington@vmware.com> | Fri Mar 23 14:36:52 2012 +0000 |
| tree | c8e617f3ba4385ab6baf92fefbb49bbb6c1769ab | |
| parent | df4687735ba94c60801bff6f93d850d9d75ffa67 [diff] | |
| parent | c1bc6a09e708984664bf0810269feea3de27bb8c [diff] |
Merge branch 'master' into 317943-replace-spring-dm-with-gemini-blueprint Conflicts: org.eclipse.virgo.nano.services/.classpath