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

Merge branch 'master' into debian
---

3290ebcab477ac749c150730526894909bdbbfcc