From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 10 Mar 2009 21:40:07 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.25~32^2~19
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=aff684f1821f4145c5aea4ced28c8f3b44051791;p=monkeysphere.git

Merge commit 'jrollins/master'
---

aff684f1821f4145c5aea4ced28c8f3b44051791