From: Jamie McClelland <jm@mayfirst.org>
Date: Fri, 15 Aug 2008 14:15:46 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.8-1~15^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38c3762c7ffb6e8759f808cc10ab451cbf2719f0;p=monkeysphere.git

Merge commit 'jrollins/master'
---

38c3762c7ffb6e8759f808cc10ab451cbf2719f0