From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 21 Jun 2012 22:38:26 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=2e054fb75b7f4ac4c1298e0d3ec1c85397075c5f;p=tmp%2Fjakarta-migration.git

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

2e054fb75b7f4ac4c1298e0d3ec1c85397075c5f