From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 29 Jul 2008 15:12:14 +0000 (-0400)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.6-1~2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=405a55189fc20ecbd417c6a4e81b11398f5cd98a;p=monkeysphere.git

Merge commit 'jamie/master'
---

405a55189fc20ecbd417c6a4e81b11398f5cd98a