From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Fri, 14 Dec 2012 20:53:38 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5bdeabd0755fe4fa854097992c2b235de2327bf7;p=tmp%2Fjakarta-migration.git

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

5bdeabd0755fe4fa854097992c2b235de2327bf7