From: Jesse Martinez <mjesse@gmail.com>
Date: Mon, 21 May 2012 00:38:04 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=00986946e97e33617d7c4c7c56bc1c60a025fe20;p=tmp%2Fjakarta-migration.git

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

00986946e97e33617d7c4c7c56bc1c60a025fe20