From: Patrick Schmitz Date: Sat, 17 Mar 2012 00:36:44 +0000 (-0700) Subject: Merge branch 'master' of github.com:collectionspace/services into UCB_ConceptAuth X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5449f7bf9d191401ee6be64265b3433d73608345;p=tmp%2Fjakarta-migration.git Merge branch 'master' of github.com:collectionspace/services into UCB_ConceptAuth --- 5449f7bf9d191401ee6be64265b3433d73608345