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

Merge commit 'mlcastle/master'
---

149197652f5c404a83e14c5d004fdf5dd1509e4c