From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 5 Sep 2008 04:39:05 +0000 (-0400)
Subject: Merge commit 'web/master'
X-Git-Tag: monkeysphere_0.15-1~16^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2debdd8e5b4550c78cc99df7e887288d73b5e294;p=monkeysphere.git

Merge commit 'web/master'
---

2debdd8e5b4550c78cc99df7e887288d73b5e294