From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 1 Mar 2009 18:49:37 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.24~41
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=2232cf43eed47ab45c7f39ca66cfbde54a602d59

Merge commit 'jrollins/master'
---

2232cf43eed47ab45c7f39ca66cfbde54a602d59