From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 8 Feb 2013 21:25:34 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=400b82f09c83b01ca9d6bdea087d7734cc4bfd04;p=tmp%2Fjakarta-migration.git

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

400b82f09c83b01ca9d6bdea087d7734cc4bfd04