From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 5 Aug 2008 19:45:50 +0000 (-0400)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.8-1~62^2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=ca63fe137cc58d709a539294459afcc2c2ec2d8a;p=monkeysphere.git

Merge commit 'jamie/master'
---

ca63fe137cc58d709a539294459afcc2c2ec2d8a