From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 30 Oct 2008 20:25:37 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.20-1~14
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=46cb105f343f7e9e97be60dcf32fae50a1463c29

Merge commit 'jrollins/master'
---

46cb105f343f7e9e97be60dcf32fae50a1463c29