From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 22 Jun 2012 18:34:06 +0000 (-0700)
Subject: Merge branch 'cspace-5271' of github.com:aronr/services into cspace-5271
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a507fced7d2ec24e6f0c680509fb4d534abd6f1c;p=tmp%2Fjakarta-migration.git

Merge branch 'cspace-5271' of github.com:aronr/services into cspace-5271
---

a507fced7d2ec24e6f0c680509fb4d534abd6f1c