Merge branch 'CSPACE-5678-E' into CSPACE-5678-F

author Richard Millet <remillet@berkeley.edu>

Thu, 8 Aug 2013 17:36:05 +0000 (10:36 -0700)

committer Richard Millet <remillet@berkeley.edu>

Thu, 8 Aug 2013 17:36:05 +0000 (10:36 -0700)
author Richard Millet <remillet@berkeley.edu>
Thu, 8 Aug 2013 17:36:05 +0000 (10:36 -0700)
committer Richard Millet <remillet@berkeley.edu>
Thu, 8 Aug 2013 17:36:05 +0000 (10:36 -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/pom.xml
Simple merge
author	Richard Millet <remillet@berkeley.edu>
	Thu, 8 Aug 2013 17:36:05 +0000 (10:36 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Thu, 8 Aug 2013 17:36:05 +0000 (10:36 -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/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history