From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 1 Feb 2009 03:59:33 +0000 (-0500)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.23~151
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ed4b369c782b96cfa5b067375585e0e757059f5;p=monkeysphere.git

Merge commit 'micah/master'
---

3ed4b369c782b96cfa5b067375585e0e757059f5