From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 12 Mar 2010 05:33:38 +0000 (-0500)
Subject: Merge branch 'master' into debian
X-Git-Tag: debian/0.2-1~5
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=905aa4654a51bb34f0715f58b4a0eca4725d8623;p=monkeysphere-validation-agent.git

Merge branch 'master' into debian
---

905aa4654a51bb34f0715f58b4a0eca4725d8623