From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 17 Feb 2012 17:47:28 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5f2de1b12ab42f2626015011c54bc42fb9a15d3a;p=tmp%2Fjakarta-migration.git

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

5f2de1b12ab42f2626015011c54bc42fb9a15d3a