From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 5 May 2008 14:56:18 +0000 (-0400)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.1-1~74
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d199f5a301b0365240a26c3a4da6efa7dde4c5d;p=monkeysphere.git

Merge commit 'jamie/master'
---

9d199f5a301b0365240a26c3a4da6efa7dde4c5d