From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 19 Feb 2009 08:01:53 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~53
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1dcdd693b854afaddb58c2049585ac9247f69a6;p=monkeysphere.git

Merge commit 'jrollins/master'
---

e1dcdd693b854afaddb58c2049585ac9247f69a6