Merge branch 'master' into CSPACE-5080

author Rick Jaffe <rjaffe@berkeley.edu>

Tue, 18 Sep 2012 22:34:55 +0000 (15:34 -0700)

committer Rick Jaffe <rjaffe@berkeley.edu>

Tue, 18 Sep 2012 22:34:55 +0000 (15:34 -0700)
author Rick Jaffe <rjaffe@berkeley.edu>
Tue, 18 Sep 2012 22:34:55 +0000 (15:34 -0700)
committer Rick Jaffe <rjaffe@berkeley.edu>
Tue, 18 Sep 2012 22:34:55 +0000 (15:34 -0700)
diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge
author	Rick Jaffe <rjaffe@berkeley.edu>
	Tue, 18 Sep 2012 22:34:55 +0000 (15:34 -0700)
committer	Rick Jaffe <rjaffe@berkeley.edu>
	Tue, 18 Sep 2012 22:34:55 +0000 (15:34 -0700)