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

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

c2013074f791ac10ea9cfee4a678fccf3820a62c