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

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

506a2bd3611f39d323f4068c72ff75a36e75dfe8