From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 5 Sep 2012 19:34:15 +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=728ea2f612c23209c98b591d997834966e26e9a7;p=tmp%2Fjakarta-migration.git

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

728ea2f612c23209c98b591d997834966e26e9a7