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

Merge commit 'jrollins/master'
---

92c70306aa5f96c8dfa69f2c90dca58908e719f7