From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 15 Nov 2008 21:02:37 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.21-1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=752a813b8bc606b8810baac8de18414e2da9b221;p=monkeysphere.git

Merge commit 'jrollins/master'
---

752a813b8bc606b8810baac8de18414e2da9b221