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

Merge branch 'master' into debian
---

77163467e7efccc9afc26714b4f0f1547d09a6eb