From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 1 Apr 2008 02:45:38 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~91
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=7ba522ae456c76c6d131ecac990815f7d55695d5

Merge commit 'jrollins/master'
---

7ba522ae456c76c6d131ecac990815f7d55695d5