From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 12 Dec 2013 00:54:31 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6c6f4f17e98c927ecac9b2a183398589b9ac4bac;p=tmp%2Fjakarta-migration.git

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

6c6f4f17e98c927ecac9b2a183398589b9ac4bac