From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 7 Apr 2009 06:43:38 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.25~31^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ee3872232ffc40ab0ae7ea823059806f839f2700;p=monkeysphere.git

Merge commit 'jrollins/master'
---

ee3872232ffc40ab0ae7ea823059806f839f2700