From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 22 Mar 2013 20:38:00 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=9874c330e928da5da0a5fdfe73c76e4d876eb802;p=tmp%2Fjakarta-migration.git

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

9874c330e928da5da0a5fdfe73c76e4d876eb802