Merge branch 'v2.5'

author Richard Millet <remillet@berkeley.edu>

Tue, 24 Jul 2012 03:30:56 +0000 (20:30 -0700)

committer Richard Millet <remillet@berkeley.edu>

Tue, 24 Jul 2012 03:30:56 +0000 (20:30 -0700)
author Richard Millet <remillet@berkeley.edu>
Tue, 24 Jul 2012 03:30:56 +0000 (20:30 -0700)
committer Richard Millet <remillet@berkeley.edu>
Tue, 24 Jul 2012 03:30:56 +0000 (20:30 -0700)
diff --cc build.properties
Simple merge
diff --cc pom.xml
Simple merge
diff --cc services/JaxRsServiceProvider/pom.xml
Simple merge
diff --cc services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
Simple merge
author	Richard Millet <remillet@berkeley.edu>
	Tue, 24 Jul 2012 03:30:56 +0000 (20:30 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Tue, 24 Jul 2012 03:30:56 +0000 (20:30 -0700)
		1	2
build.properties	patch \|	diff1 \|	diff2 \|	blob \| history
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/JaxRsServiceProvider/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history