From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 6 Dec 2012 17:37:57 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=b4d49ba1ac063c34fec4565ccedad721a07e50e8;p=tmp%2Fjakarta-migration.git

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

b4d49ba1ac063c34fec4565ccedad721a07e50e8