]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5d8592 36a0947)
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)
Conflicts:
services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptAuthorityDocumentModelHandler.java


Trivial merge