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

Merge branch 'master' into debian
---

f942340f92c2ec8ded824408765aeaff26a6f488