Merge branch 'CSPACE-5300'

author Patrick Schmitz <pschmitz@berkeley.edu>

Thu, 21 Jun 2012 06:44:53 +0000 (23:44 -0700)

committer Patrick Schmitz <pschmitz@berkeley.edu>

Thu, 21 Jun 2012 06:44:53 +0000 (23:44 -0700)
author Patrick Schmitz <pschmitz@berkeley.edu>
Thu, 21 Jun 2012 06:44:53 +0000 (23:44 -0700)
committer Patrick Schmitz <pschmitz@berkeley.edu>
Thu, 21 Jun 2012 06:44:53 +0000 (23:44 -0700)
diff --cc services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
Simple merge
diff --cc services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
Simple merge
author	Patrick Schmitz <pschmitz@berkeley.edu>
	Thu, 21 Jun 2012 06:44:53 +0000 (23:44 -0700)
committer	Patrick Schmitz <pschmitz@berkeley.edu>
	Thu, 21 Jun 2012 06:44:53 +0000 (23:44 -0700)
		1	2
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java	patch \|	diff1 \|	diff2 \|	blob \| history