From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 29 Jul 2008 13:21:12 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.6-1~7
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=e90c5fcfae6bcc22058003f7d028fdb9ce84accb;p=monkeysphere.git

Merge commit 'jrollins/master'
---

e90c5fcfae6bcc22058003f7d028fdb9ce84accb