[Pkg-privacy-commits] [vidalia] 119/160: Merge tag 'upstream/0.2.20'

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository vidalia.

commit 8e00698acb3f3c22e27ffa9b67d658491b1cc7fe
Merge: ef03354 f30c18f
Author: Dererk <dererk at debian.org>
Date:   Fri Jul 13 20:20:16 2012 -0300

    Merge tag 'upstream/0.2.20'
    
    Upstream version 0.2.20

 CHANGELOG                           | 7 +++++++
 CMakeLists.txt                      | 2 +-
 src/vidalia/MainWindow.cpp          | 4 ++--
 src/vidalia/config/AdvancedPage.cpp | 4 ++--
 src/vidalia/network/NetViewer.cpp   | 5 +++++
 5 files changed, 17 insertions(+), 5 deletions(-)

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