From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 11 Jul 2009 23:21:38 +0000 (-0400)
Subject: Merge commit 'mjgoins/master'
X-Git-Tag: monkeysphere_0.25~20^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cfe0e0885fc4210877665bb7713446c3063faee0;p=monkeysphere.git

Merge commit 'mjgoins/master'
---

cfe0e0885fc4210877665bb7713446c3063faee0