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

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

Fri, 14 Dec 2012 23:54:00 +0000 (15:54 -0800)

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

Fri, 14 Dec 2012 23:54:00 +0000 (15:54 -0800)
author Aron Roberts <aron@socrates.berkeley.edu>
Fri, 14 Dec 2012 23:54:00 +0000 (15:54 -0800)
committer Aron Roberts <aron@socrates.berkeley.edu>
Fri, 14 Dec 2012 23:54:00 +0000 (15:54 -0800)
diff --cc services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
Simple merge
author	Aron Roberts <aron@socrates.berkeley.edu>
	Fri, 14 Dec 2012 23:54:00 +0000 (15:54 -0800)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Fri, 14 Dec 2012 23:54:00 +0000 (15:54 -0800)