From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 13 Feb 2013 09:18:26 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f1be8c4cf168992c40c123ecc4cf85d56016887f;p=tmp%2Fjakarta-migration.git

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

f1be8c4cf168992c40c123ecc4cf85d56016887f