From: Richard Millet Date: Wed, 25 Apr 2012 18:00:03 +0000 (-0700) Subject: Merge branch 'master' of github.com:collectionspace/services X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f1e0adf634a901adad574bfde9402b107fc96f76;p=tmp%2Fjakarta-migration.git Merge branch 'master' of github.com:collectionspace/services Conflicts: services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptAuthorityDocumentModelHandler.java --- f1e0adf634a901adad574bfde9402b107fc96f76