[Pkg-privacy-commits] [onioncat] 01/02: Merge branch 'debian' into squeeze-backports

[Ximin Luo]

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

infinity0 pushed a commit to annotated tag onioncat_debian/0.2.2+svn553-2_bpo60+1
in repository onioncat.

commit a94ea0397f809e11fcb7f471532a3493d90ad649
Merge: bf655d0 3533024
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Sep 5 14:24:30 2011 +0200

    Merge branch 'debian' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 debian/README.Debian     | 11 +++++++----
 debian/changelog         | 12 +++++++++---
 debian/control           |  1 +
 debian/copyright         |  8 ++++----
 debian/onioncat.default  |  3 +--
 debian/onioncat.init     | 10 +++-------
 debian/onioncat.postinst |  2 +-
 debian/onioncat.postrm   | 17 -----------------
 8 files changed, 26 insertions(+), 38 deletions(-)

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