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

Merge branch 'master' into debian
---

9be5f0c46bf5cd4ebe13dd1a62fd17c2b28515c6