From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 5 May 2008 14:56:26 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~73
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=85dfda57ca7f89b9ef381ceba425c27844440d14;hp=--cc;p=monkeysphere.git

Merge commit 'jrollins/master'
---

85dfda57ca7f89b9ef381ceba425c27844440d14