From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 31 Mar 2010 22:17:10 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: monkeysphere_0.30-1~2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5e2064f9b547f00daf06311d818085e69fdb4caf;p=monkeysphere.git

Merge branch 'master' into debian
---

5e2064f9b547f00daf06311d818085e69fdb4caf