Merge remote-tracking branch 'upstream/master' into CSPACE-5943

author Aron Roberts <aron@socrates.berkeley.edu>

Fri, 5 Apr 2013 23:35:37 +0000 (16:35 -0700)

committer Aron Roberts <aron@socrates.berkeley.edu>

Fri, 5 Apr 2013 23:35:37 +0000 (16:35 -0700)
author Aron Roberts <aron@socrates.berkeley.edu>
Fri, 5 Apr 2013 23:35:37 +0000 (16:35 -0700)
committer Aron Roberts <aron@socrates.berkeley.edu>
Fri, 5 Apr 2013 23:35:37 +0000 (16:35 -0700)
diff --cc services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
Simple merge
author	Aron Roberts <aron@socrates.berkeley.edu>
	Fri, 5 Apr 2013 23:35:37 +0000 (16:35 -0700)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Fri, 5 Apr 2013 23:35:37 +0000 (16:35 -0700)