From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 19 Feb 2009 02:32:21 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~58^2~9
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=e2b547631eae05103fe3219f4e2c7a4f618ef5d0;p=monkeysphere.git

Merge commit 'jrollins/master'
---

e2b547631eae05103fe3219f4e2c7a4f618ef5d0