From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 23 Mar 2010 21:15:33 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: monkeysphere_0.30-1~6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d97b9dccfc80be40e98df47fa4e8e09b367a2d3f;p=monkeysphere.git

Merge branch 'master' into debian
---

d97b9dccfc80be40e98df47fa4e8e09b367a2d3f