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

Merge commit 'jrollins/master'
---

10d38ac8e8580322d533c3c5e1b7fad13363b7e5