[Pkg-privacy-commits] [vidalia] 128/160: Merge tag 'debian/0.2.20-1' into debian-wheezy

[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 8890796f60b0ebf84e912e16d5cea818ffa85802
Merge: 817045c 018bfa7
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Jan 28 16:55:39 2013 +0100

    Merge tag 'debian/0.2.20-1' into debian-wheezy
    
    Debian upload to Unstable 0.2.20-1

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

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