[Pkg-privacy-commits] [msva-perl] 137/356: Merge remote branch 'mjgoins/marginalUI-perl'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository msva-perl.

commit c366bdb2942539d669ca6891e188204c6857d0c2
Merge: 06bc9a7 6e945d0
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sun Oct 3 04:01:19 2010 -0400

    Merge remote branch 'mjgoins/marginalUI-perl'

 Crypt/Monkeysphere/MSVA/MarginalUI.glade | 68 ++++++++++++++++++++++++++++++++
 Crypt/Monkeysphere/MSVA/MarginalUI.pm    | 61 ++++++++++++++++++++++++++++
 msva-perl                                |  1 +
 3 files changed, 130 insertions(+)

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/;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/msva-perl.git