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

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

9a5d6daf4f77f2b2f6b9537a7fc4291b0cf9833c