From: remillet <remillet@yahoo.com>
Date: Mon, 11 Jul 2016 16:13:05 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=321b00b28b53e7f00f7a8e028c6b97d06de971e2;p=tmp%2Fjakarta-migration.git

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

321b00b28b53e7f00f7a8e028c6b97d06de971e2