From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 4 Feb 2009 06:47:46 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~121^2~13
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=inline;h=af417e29d0f2e9cd1add6ad47dfbbde9e35a5433;p=monkeysphere.git

Merge commit 'jrollins/master'
---

af417e29d0f2e9cd1add6ad47dfbbde9e35a5433