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

Merge branch 'master' into debian
---

6493394b46d4c1ac3d5eb6075d6d5dc260c8487c