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

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

f9ca9616ae5c9cdaff3e6c4d02aef091ba9a9a63