From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 9 Mar 2010 07:24:09 +0000 (-0500)
Subject: Merge branch 'master' into debian
X-Git-Tag: debian/0.2-1~9
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4473e06ec77267046b6af4762e1eb59b4600ebca;p=monkeysphere-validation-agent.git

Merge branch 'master' into debian
---

4473e06ec77267046b6af4762e1eb59b4600ebca