Merge remote-tracking branch 'upstream/master' into cspace-5024-branch

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

Fri, 20 Apr 2012 20:50:44 +0000 (13:50 -0700)

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

Fri, 20 Apr 2012 20:50:44 +0000 (13:50 -0700)
author Aron Roberts <aron@socrates.berkeley.edu>
Fri, 20 Apr 2012 20:50:44 +0000 (13:50 -0700)
committer Aron Roberts <aron@socrates.berkeley.edu>
Fri, 20 Apr 2012 20:50:44 +0000 (13:50 -0700)
diff --cc services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
Simple merge
author	Aron Roberts <aron@socrates.berkeley.edu>
	Fri, 20 Apr 2012 20:50:44 +0000 (13:50 -0700)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Fri, 20 Apr 2012 20:50:44 +0000 (13:50 -0700)