From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 11 Apr 2012 16:12:59 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=40da4eda1a6d2f166fdc3cf6183a8b57010c2e6d;p=tmp%2Fjakarta-migration.git

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

40da4eda1a6d2f166fdc3cf6183a8b57010c2e6d