]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge remote-tracking branch 'upstream/master' into CSPACE-5271
authorAron Roberts <aron@socrates.berkeley.edu>
Tue, 14 Aug 2012 21:21:18 +0000 (14:21 -0700)
committerAron Roberts <aron@socrates.berkeley.edu>
Tue, 14 Aug 2012 21:21:18 +0000 (14:21 -0700)
commit83b469febd1f6c063146f048430803bf14e903b3
treed1a3a0f83aaef64a914d55d8aca02ba089f00d42
parent6220da6ac0d709995363fe5de25dc213fec26d00
parentceb7e328dbe3de0d4659cbec00f0596cde12abf0
Merge remote-tracking branch 'upstream/master' into CSPACE-5271
services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java