From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 1 Feb 2009 04:57:50 +0000 (-0500)
Subject: Merge commit 'mjgoins/master'
X-Git-Tag: monkeysphere_0.23~149^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b5a517e61fb5028aea6c2521524ccf2a377d822;p=monkeysphere.git

Merge commit 'mjgoins/master'
---

5b5a517e61fb5028aea6c2521524ccf2a377d822