Merge branch 'CSPACE-5059'

author Patrick Schmitz <pschmitz@berkeley.edu>

Tue, 15 May 2012 15:26:35 +0000 (08:26 -0700)

committer Patrick Schmitz <pschmitz@berkeley.edu>

Tue, 15 May 2012 15:26:35 +0000 (08:26 -0700)
author Patrick Schmitz <pschmitz@berkeley.edu>
Tue, 15 May 2012 15:26:35 +0000 (08:26 -0700)
committer Patrick Schmitz <pschmitz@berkeley.edu>
Tue, 15 May 2012 15:26:35 +0000 (08:26 -0700)
diff --cc services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
Simple merge
author	Patrick Schmitz <pschmitz@berkeley.edu>
	Tue, 15 May 2012 15:26:35 +0000 (08:26 -0700)
committer	Patrick Schmitz <pschmitz@berkeley.edu>
	Tue, 15 May 2012 15:26:35 +0000 (08:26 -0700)