From: Jameson Rollins <jrollins@finestructure.net>
Date: Mon, 11 Jan 2010 00:49:12 +0000 (-0500)
Subject: Merge remote branch 'mjgoins/master'
X-Git-Tag: monkeysphere_0.27~7
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=109f4ed7d4aea89fa03701d105a9b8422209c170

Merge remote branch 'mjgoins/master'
---

109f4ed7d4aea89fa03701d105a9b8422209c170