From: Richard Millet <remillet@berkeley.edu>
Date: Mon, 1 Apr 2013 16:13:04 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f6f92ab13da2a4356463452b9090f8b87add19ef;p=tmp%2Fjakarta-migration.git

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

f6f92ab13da2a4356463452b9090f8b87add19ef