From: Jesse Martinez <mjesse@gmail.com>
Date: Tue, 22 May 2012 20:18:28 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7a58e6c9aae28bea79ce6092c673bb784bd32354;p=tmp%2Fjakarta-migration.git

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

7a58e6c9aae28bea79ce6092c673bb784bd32354