From: Jesse Martinez <mjesse@gmail.com>
Date: Wed, 30 May 2012 14:44:53 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=36cde8d59abe734b902b8e7b1c20e2dff0b48347;p=tmp%2Fjakarta-migration.git

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

36cde8d59abe734b902b8e7b1c20e2dff0b48347