From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 18 Feb 2009 04:33:55 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~69
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=278c20f82d2ee0954a04b8daae5cbc2788c0015c;hp=--cc;p=monkeysphere.git

Merge commit 'jrollins/master'
---

278c20f82d2ee0954a04b8daae5cbc2788c0015c