From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 8 Aug 2008 13:09:31 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.8-1~39
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=26515a1311d364501d562b706660337fbb906011

Merge commit 'jrollins/master'
---

26515a1311d364501d562b706660337fbb906011