From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 25 Jul 2012 18:52:07 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=4cefb7d8ba5ff61c51da17f7f7252a02e3336d08;p=tmp%2Fjakarta-migration.git

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

4cefb7d8ba5ff61c51da17f7f7252a02e3336d08