]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge remote-tracking branch 'upstream/master' into cspace-5271
authorAron Roberts <aron@socrates.berkeley.edu>
Fri, 22 Jun 2012 18:25:58 +0000 (11:25 -0700)
committerAron Roberts <aron@socrates.berkeley.edu>
Fri, 22 Jun 2012 18:25:58 +0000 (11:25 -0700)
commitb772efef552952bd0aea8828069d48301c6bc188
tree005a5d96a12fbe1abef09015ad7b6443539587c2
parentfef27f94c658fdd648b1096758703fe3e4895d2f
parentd52f460153a009683ff2fe8c5578e9b237f0d6bd
Merge remote-tracking branch 'upstream/master' into cspace-5271

Conflicts:
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java