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

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

Wed, 29 May 2013 02:24:34 +0000 (19:24 -0700)

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

Wed, 29 May 2013 02:24:34 +0000 (19:24 -0700)
author Aron Roberts <aron@socrates.berkeley.edu>
Wed, 29 May 2013 02:24:34 +0000 (19:24 -0700)
committer Aron Roberts <aron@socrates.berkeley.edu>
Wed, 29 May 2013 02:24:34 +0000 (19:24 -0700)
diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge
author	Aron Roberts <aron@socrates.berkeley.edu>
	Wed, 29 May 2013 02:24:34 +0000 (19:24 -0700)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Wed, 29 May 2013 02:24:34 +0000 (19:24 -0700)