From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 11 Jul 2009 20:26:26 +0000 (-0400)
Subject: Merge commit 'mlcastle/master'
X-Git-Tag: monkeysphere_0.25~25^2~3
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=f3a03d72bc9c01491fc1cfccdbcef353db058548;p=monkeysphere.git

Merge commit 'mlcastle/master'
---

f3a03d72bc9c01491fc1cfccdbcef353db058548