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

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

b5d85921210693f8f8baf27bd067e3369e5558ba