Merge remote-tracking branch 'walkerart/procedure-work' into CSPACE-6117

author Aron Roberts <aron@socrates.berkeley.edu>

Thu, 1 Aug 2013 00:47:33 +0000 (17:47 -0700)

committer Aron Roberts <aron@socrates.berkeley.edu>

Thu, 1 Aug 2013 00:47:33 +0000 (17:47 -0700)
author Aron Roberts <aron@socrates.berkeley.edu>
Thu, 1 Aug 2013 00:47:33 +0000 (17:47 -0700)
committer Aron Roberts <aron@socrates.berkeley.edu>
Thu, 1 Aug 2013 00:47:33 +0000 (17:47 -0700)
diff --cc services/JaxRsServiceProvider/pom.xml
Simple merge
diff --cc services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
Simple merge
diff --cc services/build.xml
Simple merge
diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge
diff --cc services/pom.xml
Simple merge
diff --cc services/relation/service/pom.xml
Simple merge
diff --cc services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
Simple merge
author	Aron Roberts <aron@socrates.berkeley.edu>
	Thu, 1 Aug 2013 00:47:33 +0000 (17:47 -0700)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Thu, 1 Aug 2013 00:47:33 +0000 (17:47 -0700)
		1	2
services/JaxRsServiceProvider/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/build.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/relation/service/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java	patch \|	diff1 \|	diff2 \|	blob \| history