From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 13 Apr 2012 02:43:17 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5f0cb19a4716b5d646a1443e1c990ffcc2c3314c;p=tmp%2Fjakarta-migration.git

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

5f0cb19a4716b5d646a1443e1c990ffcc2c3314c