From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 7 May 2010 02:56:00 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: monkeysphere_0.31-1~4
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=da6924c407c325c43f5bc0f5fff95981e63d94fb;p=monkeysphere.git

Merge branch 'master' into debian
---

da6924c407c325c43f5bc0f5fff95981e63d94fb