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

Merge branch 'master' into debian
---

cad5a11067a197f8c310d2b68fa9645ed60822ad