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

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

0adf03abf47b02dee0d5f34529d8d68a27349fae