From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 4 Jul 2012 01:18:17 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=cd74f584ea293afe6c69b5afcca13e6d76c00a49;p=tmp%2Fjakarta-migration.git

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

cd74f584ea293afe6c69b5afcca13e6d76c00a49