From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 15 Mar 2010 18:29:18 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: debian/0.2-1^0
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e2bfaac19b663141a1c3b93218298ec482e5624;p=monkeysphere-validation-agent.git

Merge branch 'master' into debian
---

1e2bfaac19b663141a1c3b93218298ec482e5624