From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 3 Oct 2010 08:01:19 +0000 (-0400)
Subject: Merge remote branch 'mjgoins/marginalUI-perl'
X-Git-Tag: msva-perl/0.4~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c366bdb2942539d669ca6891e188204c6857d0c2;p=monkeysphere-validation-agent.git

Merge remote branch 'mjgoins/marginalUI-perl'
---

c366bdb2942539d669ca6891e188204c6857d0c2
diff --cc msva-perl
index 70417f3,5c44219..45f1ce7
--- a/msva-perl
+++ b/msva-perl
@@@ -21,6 -21,8 +21,7 @@@ use strict
  
  { package MSVA;
  
 -use Data::Dumper;
+   use Crypt::Monkeysphere::MSVA::MarginalUI;
    use parent qw(HTTP::Server::Simple::CGI);
    require Crypt::X509;
    use Regexp::Common qw /net/;