From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 27 May 2008 01:46:38 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~69
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=56e3a760b8913a4757115d9c0613ff3581c898ff;p=monkeysphere.git

Merge commit 'jrollins/master'
---

56e3a760b8913a4757115d9c0613ff3581c898ff