]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge branch 'master' of github.com:collectionspace/services
authorPatrick Schmitz <pschmitz@berkeley.edu>
Fri, 14 Dec 2012 20:52:14 +0000 (12:52 -0800)
committerPatrick Schmitz <pschmitz@berkeley.edu>
Fri, 14 Dec 2012 20:52:14 +0000 (12:52 -0800)
commit58edd0c17f507cf181a350a302edfee2df2bcc69
tree2a487b8af24b5f453a89243e81dc1067c53139fc
parent5df37c372a54f48b26e19d808a42d27e23854c23
parentf25e3e3fa69e35b68a1f8685e494022e2fa2d117
Merge branch 'master' of github.com:collectionspace/services

Conflicts:
services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java