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

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

95957cdc81e75903ee00455f2b65a79817f4d696