From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 3 May 2008 15:36:37 +0000 (-0400)
Subject: Merge commit 'mlcastle/master'
X-Git-Tag: monkeysphere_0.1-1~76
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=0b21bae54002f213118aa537d432f3375799073b;p=monkeysphere.git

Merge commit 'mlcastle/master'
---

0b21bae54002f213118aa537d432f3375799073b