From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 21 Jun 2008 17:53:06 +0000 (-0400)
Subject: Merge commit 'mlcastle/master'
X-Git-Tag: monkeysphere_0.2-1~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f659da8ba2e184a9eb60da2d65c1e81c33f06772;p=monkeysphere.git

Merge commit 'mlcastle/master'
---

f659da8ba2e184a9eb60da2d65c1e81c33f06772