[postfwd] 94/96: Merge tag 'upstream/1.20'

[Jan Wagner]

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

waja pushed a commit to branch master
in repository postfwd.

commit 19ceeb5e378a4272cfed3bb78600050c633a490a
Merge: a01d770 6a47d71
Author: Jan Wagner <waja at cyconet.org>
Date:   Tue Nov 5 17:33:35 2013 +0100

    Merge tag 'upstream/1.20'
    
    Upstream version 1.20

 bin/postfwd-script.sh               |    1 +
 doc/CHANGELOG                       |   15 +
 doc/CHANGELOG2                      |  173 ++
 doc/postfwd.html                    |   24 +-
 doc/postfwd.txt                     |   24 +-
 doc/{postfwd.html => postfwd2.html} |  351 +--
 doc/{postfwd.txt => postfwd2.txt}   |  363 +--
 man/man8/postfwd.8                  |   34 +-
 man/man8/{postfwd.8 => postfwd2.8}  |  383 ++--
 sbin/postfwd                        |  148 +-
 sbin/postfwd2                       | 4219 +++++++++++++++++++++++++++++++++++
 11 files changed, 5166 insertions(+), 569 deletions(-)

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