[Pkg-privacy-commits] [onioncat] 03/04: 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-1_bpo60+1
in repository onioncat.

commit 3e53b4c3882391f684cb76909442f720fbc3ca94
Merge: 59435f7 1d2360b
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Aug 24 18:42:14 2011 +0200

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

 configure                                          | 22 +++----
 debian/changelog                                   | 24 +++++---
 debian/control                                     |  2 +-
 debian/copyright                                   |  7 ++-
 debian/onioncat.default                            |  6 +-
 debian/onioncat.init                               |  6 +-
 .../0001-Fix-spelling-typos-in-manpage.patch       | 43 -------------
 ...Don-t-use-hyphen-as-minus-sign-in-manpage.patch | 72 ----------------------
 debian/patches/series                              |  2 -
 debian/rules                                       |  3 +
 debian/watch                                       |  3 +
 man/ocat.1                                         | 20 +++---
 12 files changed, 54 insertions(+), 156 deletions(-)

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