From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 31 Aug 2008 21:34:18 +0000 (-0400)
Subject: Merge commit 'web/master'
X-Git-Tag: monkeysphere_0.12-1~33^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=426e933f733339e1bc787be0a56c179015b07b13;p=monkeysphere.git

Merge commit 'web/master'
---

426e933f733339e1bc787be0a56c179015b07b13