From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 20 Sep 2012 15:43:38 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ca2ec0f4a2a87e9a6a51f5a82d69ee5ef8ffa5cb;p=tmp%2Fjakarta-migration.git

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

ca2ec0f4a2a87e9a6a51f5a82d69ee5ef8ffa5cb