Merge branch 'master' of github.com:collectionspace/services

author Patrick Schmitz <pschmitz@berkeley.edu>

Fri, 14 Dec 2012 20:53:38 +0000 (12:53 -0800)

committer Patrick Schmitz <pschmitz@berkeley.edu>

Fri, 14 Dec 2012 20:53:38 +0000 (12:53 -0800)
author Patrick Schmitz <pschmitz@berkeley.edu>
Fri, 14 Dec 2012 20:53:38 +0000 (12:53 -0800)
committer Patrick Schmitz <pschmitz@berkeley.edu>
Fri, 14 Dec 2012 20:53:38 +0000 (12:53 -0800)
diff --cc services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
Simple merge
author	Patrick Schmitz <pschmitz@berkeley.edu>
	Fri, 14 Dec 2012 20:53:38 +0000 (12:53 -0800)
committer	Patrick Schmitz <pschmitz@berkeley.edu>
	Fri, 14 Dec 2012 20:53:38 +0000 (12:53 -0800)