From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 3 May 2008 16:04:18 +0000 (-0400)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.1-1~75
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=b77a5f163462c9a45a6cb76aeaeecd2f69f57ed3;p=monkeysphere.git

Merge commit 'jamie/master'
---

b77a5f163462c9a45a6cb76aeaeecd2f69f57ed3