From: Richard Millet <remillet@berkeley.edu>
Date: Sun, 18 Mar 2012 23:01:40 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ffbe1261d5ed52245e0512dc8eb3f0a36f2b7c70;p=tmp%2Fjakarta-migration.git

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

ffbe1261d5ed52245e0512dc8eb3f0a36f2b7c70