From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 13 Mar 2010 20:21:00 +0000 (-0500)
Subject: Merge branch 'master' into debian
X-Git-Tag: debian/0.2-1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4c729aa5e82886dbe1ff0f9e5bcf61e2241fce8;p=monkeysphere-validation-agent.git

Merge branch 'master' into debian
---

b4c729aa5e82886dbe1ff0f9e5bcf61e2241fce8