Merge branch 'master' into CSPACE-5036

author Richard Millet <remillet@berkeley.edu>

Wed, 23 May 2012 17:29:02 +0000 (10:29 -0700)

committer Richard Millet <remillet@berkeley.edu>

Wed, 23 May 2012 17:29:02 +0000 (10:29 -0700)
author Richard Millet <remillet@berkeley.edu>
Wed, 23 May 2012 17:29:02 +0000 (10:29 -0700)
committer Richard Millet <remillet@berkeley.edu>
Wed, 23 May 2012 17:29:02 +0000 (10:29 -0700)
diff --cc pom.xml
Simple merge
diff --cc services/common/pom.xml
Simple merge
diff --cc services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java
Simple merge
diff --cc services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
Simple merge
author	Richard Millet <remillet@berkeley.edu>
	Wed, 23 May 2012 17:29:02 +0000 (10:29 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Wed, 23 May 2012 17:29:02 +0000 (10:29 -0700)
		1	2
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java	patch \|	diff1 \|	diff2 \|	blob \| history