From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 15 Nov 2008 21:21:54 +0000 (-0500)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.21-1^0
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=631af9518907f9c4945c3969aaa218eed2554f47;p=monkeysphere.git

Merge commit 'micah/master'
---

631af9518907f9c4945c3969aaa218eed2554f47