]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge branch 'master' of github.com:collectionspace/services
authorRichard Millet <richard.millet@berkeley.edu>
Wed, 25 Apr 2012 18:00:03 +0000 (11:00 -0700)
committerRichard Millet <richard.millet@berkeley.edu>
Wed, 25 Apr 2012 18:00:03 +0000 (11:00 -0700)
commitf1e0adf634a901adad574bfde9402b107fc96f76
treedaa93dc12c91371387e57dd44444e5233a493a11
parentb5d85921210693f8f8baf27bd067e3369e5558ba
parent36a09470b9be18abe026c1e5b9201e1e84bf2c84
Merge branch 'master' of github.com:collectionspace/services

Conflicts:
services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptAuthorityDocumentModelHandler.java