From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 11 Jul 2012 17:47:45 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6cf02811c3757e42fe81b3a4ce3cd6e70e50e6ed;p=tmp%2Fjakarta-migration.git

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

6cf02811c3757e42fe81b3a4ce3cd6e70e50e6ed