From: Jameson Rollins <jrollins@finestructure.net>
Date: Tue, 9 Mar 2010 04:38:12 +0000 (-0500)
Subject: Merge remote branch 'mjgoins/master'
X-Git-Tag: monkeysphere_0.29~34
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=c39d11682121a43e690465d194a5bd9fa2275f42;p=monkeysphere.git

Merge remote branch 'mjgoins/master'
---

c39d11682121a43e690465d194a5bd9fa2275f42