From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 19 Aug 2008 14:47:00 +0000 (-0400)
Subject: Merge commit 'mlcastle/master'
X-Git-Tag: monkeysphere_0.11-1~8^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a9fb8b965cf02bb5aaaa9b6353ea557abbc09d9;p=monkeysphere.git

Merge commit 'mlcastle/master'
---

6a9fb8b965cf02bb5aaaa9b6353ea557abbc09d9