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

Merge commit 'jrollins/master'
---

62937dd637ef0af45de783a3e619760e064b8ac7