Merge tag 'v3.2.1' into procedure-work

author Jesse Martinez <mjesse@gmail.com>

Mon, 11 Mar 2013 19:24:21 +0000 (15:24 -0400)

committer Jesse Martinez <mjesse@gmail.com>

Mon, 11 Mar 2013 19:24:21 +0000 (15:24 -0400)
author Jesse Martinez <mjesse@gmail.com>
Mon, 11 Mar 2013 19:24:21 +0000 (15:24 -0400)
committer Jesse Martinez <mjesse@gmail.com>
Mon, 11 Mar 2013 19:24:21 +0000 (15:24 -0400)
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
author	Jesse Martinez <mjesse@gmail.com>
	Mon, 11 Mar 2013 19:24:21 +0000 (15:24 -0400)
committer	Jesse Martinez <mjesse@gmail.com>
	Mon, 11 Mar 2013 19:24:21 +0000 (15:24 -0400)
		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