From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 10 Mar 2010 07:43:32 +0000 (-0500)
Subject: Merge branch 'master' into debian
X-Git-Tag: debian/0.2-1~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a58e2e0ce3e0664b41d6f60a1edd682efcec5a46;p=monkeysphere-validation-agent.git

Merge branch 'master' into debian
---

a58e2e0ce3e0664b41d6f60a1edd682efcec5a46