From: remillet <remillet@yahoo.com>
Date: Wed, 22 Apr 2015 19:35:20 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f5f5899093fa00ff12118f8f0f0ea6bcc5fbd16a;p=tmp%2Fjakarta-migration.git

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

f5f5899093fa00ff12118f8f0f0ea6bcc5fbd16a