Merge remote-tracking branch 'plschmitz/UCB_ConceptAuth' into concept

author Ray Lee <rhlee@berkeley.edu>

Mon, 19 Mar 2012 17:21:38 +0000 (10:21 -0700)

committer Ray Lee <rhlee@berkeley.edu>

Mon, 19 Mar 2012 17:21:38 +0000 (10:21 -0700)
author Ray Lee <rhlee@berkeley.edu>
Mon, 19 Mar 2012 17:21:38 +0000 (10:21 -0700)
committer Ray Lee <rhlee@berkeley.edu>
Mon, 19 Mar 2012 17:21:38 +0000 (10:21 -0700)
diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge
author	Ray Lee <rhlee@berkeley.edu>
	Mon, 19 Mar 2012 17:21:38 +0000 (10:21 -0700)
committer	Ray Lee <rhlee@berkeley.edu>
	Mon, 19 Mar 2012 17:21:38 +0000 (10:21 -0700)