From: Richard Millet <richard.millet@berkeley.edu>
Date: Wed, 27 Jun 2012 23:34:41 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7ca517dc73707bcfd856be1cf00598e13a558aca;p=tmp%2Fjakarta-migration.git

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

7ca517dc73707bcfd856be1cf00598e13a558aca