From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 11 Jun 2008 21:10:01 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~51
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=f95803153b478e3ca3dd634c340355d7d582dcea

Merge commit 'jrollins/master'
---

f95803153b478e3ca3dd634c340355d7d582dcea