From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 30 Nov 2008 22:58:06 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~165^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d2aa12d0161e4eb84ad8f7b4dd485337e683bb6;p=monkeysphere.git

Merge commit 'jrollins/master'
---

2d2aa12d0161e4eb84ad8f7b4dd485337e683bb6