From: remillet <remillet@yahoo.com>
Date: Fri, 15 Jan 2016 01:24:24 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=dface7d1d91bbc04b1a4a251389a671088d255f2;p=tmp%2Fjakarta-migration.git

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

dface7d1d91bbc04b1a4a251389a671088d255f2