Merge branch 'master' of github.com:collectionspace/services

author Richard Millet <remillet@berkeley.edu>

Tue, 11 Sep 2012 23:02:49 +0000 (16:02 -0700)

committer Richard Millet <remillet@berkeley.edu>

Tue, 11 Sep 2012 23:02:49 +0000 (16:02 -0700)
author Richard Millet <remillet@berkeley.edu>
Tue, 11 Sep 2012 23:02:49 +0000 (16:02 -0700)
committer Richard Millet <remillet@berkeley.edu>
Tue, 11 Sep 2012 23:02:49 +0000 (16:02 -0700)
diff --cc services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
Simple merge
diff --cc services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
Simple merge
author	Richard Millet <remillet@berkeley.edu>
	Tue, 11 Sep 2012 23:02:49 +0000 (16:02 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Tue, 11 Sep 2012 23:02:49 +0000 (16:02 -0700)
		1	2
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java	patch \|	diff1 \|	diff2 \|	blob \| history