From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 2 Mar 2009 19:39:21 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.24~13^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=47456afe7d13f6c58b535082b62e888d8e4dc4cb;p=monkeysphere.git

Merge commit 'jrollins/master'
---

47456afe7d13f6c58b535082b62e888d8e4dc4cb