]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge remote-tracking branch 'upstream/master' into CSPACE-5271
authorAron Roberts <aron@socrates.berkeley.edu>
Wed, 5 Sep 2012 19:32:15 +0000 (12:32 -0700)
committerAron Roberts <aron@socrates.berkeley.edu>
Wed, 5 Sep 2012 19:32:15 +0000 (12:32 -0700)
commitf44c8c8348044a9f8af7aa41ca1b38438ae724c4
tree4e850e48087788a11c9317ecfdb1c1e489aea8b6
parentb905b2acc79173651fdf95330b341a76561fd799
parentdd8b1b003a559e4c81bac7f31f1e82cad44f1642
Merge remote-tracking branch 'upstream/master' into CSPACE-5271
services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java