From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 29 May 2013 02:24:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into CSPACE-6001
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=68f5ec11629541b60f1b667d5534e347cd855a60;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'upstream/master' into CSPACE-6001
---

68f5ec11629541b60f1b667d5534e347cd855a60