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

Merge commit 'jrollins/master'
---

c6ba2bb28cf594f2a613b989fe7cd71d9550633a