From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 25 Nov 2008 17:16:16 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.22-1~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c7f716a00700dda91b90dcde56fcd7c2ba876d1;p=monkeysphere.git

Merge commit 'jrollins/master'
---

6c7f716a00700dda91b90dcde56fcd7c2ba876d1