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

Merge commit 'jrollins/master'
---

6476671df265a673b678ee692d5010202bc519d6