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

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

ebd6aff5d9cab7dec811553f87c1ecaa8958a9fa