From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 16 Nov 2008 05:54:29 +0000 (-0500)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.22-1~23^2~4^2~5
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=a57e08b2beba4aa21ba023059bb3b6cb833f3c32

Merge commit 'micah/master'
---

a57e08b2beba4aa21ba023059bb3b6cb833f3c32