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

author Patrick Schmitz <pschmitz@berkeley.edu>

Fri, 9 Mar 2012 23:55:31 +0000 (15:55 -0800)

committer Patrick Schmitz <pschmitz@berkeley.edu>

Fri, 9 Mar 2012 23:55:31 +0000 (15:55 -0800)
author Patrick Schmitz <pschmitz@berkeley.edu>
Fri, 9 Mar 2012 23:55:31 +0000 (15:55 -0800)
committer Patrick Schmitz <pschmitz@berkeley.edu>
Fri, 9 Mar 2012 23:55:31 +0000 (15:55 -0800)
diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge
author	Patrick Schmitz <pschmitz@berkeley.edu>
	Fri, 9 Mar 2012 23:55:31 +0000 (15:55 -0800)
committer	Patrick Schmitz <pschmitz@berkeley.edu>
	Fri, 9 Mar 2012 23:55:31 +0000 (15:55 -0800)