From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 19 Feb 2009 09:31:25 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~44
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=16161f54955fda7bf71e3d8bc9ffc192b98f5a4f;p=monkeysphere.git

Merge commit 'jrollins/master'
---

16161f54955fda7bf71e3d8bc9ffc192b98f5a4f