From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 17 Jun 2008 18:52:31 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~19
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=9c94e937fbe8beb56956365cac07d6eff45215cd;hp=--cc;p=monkeysphere.git

Merge commit 'jrollins/master'
---

9c94e937fbe8beb56956365cac07d6eff45215cd