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

Merge commit 'mlcastle/master'
---

5f04744f98c050ae4f9443754f74ebaa0d9da425