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

Merge branch 'master' into debian
---

b7963499559ed815d2fb67e102bd6113076fc3ed