From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 23 Jun 2008 21:02:33 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.2-1~8
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=241254abd25c217ffe3ee8ccb7858498ade28856;p=monkeysphere.git

Merge commit 'jrollins/master'
---

241254abd25c217ffe3ee8ccb7858498ade28856