]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge branch 'master' of github.com:collectionspace/services
authorRichard Millet <remillet@berkeley.edu>
Tue, 11 Sep 2012 23:02:49 +0000 (16:02 -0700)
committerRichard Millet <remillet@berkeley.edu>
Tue, 11 Sep 2012 23:02:49 +0000 (16:02 -0700)
commit03283188f8bd208974323d1c00b25f4c04ab8176
tree87cc105e4123b21ad41518cddfc129ede6a5a5a7
parent3c2eae78769f62aad401dabc91a014aff4a532f2
parentc8a092821d671a475a2a8e828fde2277216241bf
Merge branch 'master' of github.com:collectionspace/services

Conflicts:
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java