From: Richard Millet <richard.millet@berkeley.edu>
Date: Mon, 2 Jul 2012 18:21:22 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8d2cf167ba88c6f680d93c39b67254f1ff6ec5c2;p=tmp%2Fjakarta-migration.git

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

8d2cf167ba88c6f680d93c39b67254f1ff6ec5c2