From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 9 Mar 2008 00:34:01 +0000 (-0500)
Subject: Merge commit 'greg/master'
X-Git-Tag: monkeysphere_0.1-1~92
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=cdbde9585432938d5a3ea2f6203be4d1532c8dfb;p=monkeysphere.git

Merge commit 'greg/master'
---

cdbde9585432938d5a3ea2f6203be4d1532c8dfb