From: Richard Millet <richard.millet@berkeley.edu>
Date: Wed, 5 Sep 2012 06:07:22 +0000 (-0700)
Subject: Merge branch 'CSPACE-5458-REM' of github.com:collectionspace/services into CSPACE... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ab42aef13dc95da512a94cfbd1704eca72637d9f;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-5458-REM' of github.com:collectionspace/services into CSPACE-5458-REM

Conflicts:
	services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
	services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
---

ab42aef13dc95da512a94cfbd1704eca72637d9f