From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 24 Jun 2008 02:35:58 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.3-1~3
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=bcf8cd7707dc85f9175d79596a1d0f2c0b3b54a5;p=monkeysphere.git

Merge commit 'jrollins/master'
---

bcf8cd7707dc85f9175d79596a1d0f2c0b3b54a5