From: Jamie McClelland <jm@mayfirst.org>
Date: Sat, 6 Sep 2008 06:59:21 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.16-1~86
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e1f4562f58c8b9b02cd07e4920262e9b42a6d16;p=monkeysphere.git

Merge commit 'jrollins/master'
---

8e1f4562f58c8b9b02cd07e4920262e9b42a6d16