From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 9 Nov 2008 22:51:24 +0000 (-0500)
Subject: Merge commit 'web/master'
X-Git-Tag: monkeysphere_0.20-1~6
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=6bc022e40bca1b5cd4aa5878572faa3152a9195c

Merge commit 'web/master'
---

6bc022e40bca1b5cd4aa5878572faa3152a9195c