CVS commit: src/external/ibm-public/postfix/dist

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    src
Committed By:   tron
Date:           Sun Jul 31 10:05:04 UTC 2011

Modified Files:
        src/external/ibm-public/postfix/dist: makedefs postfix-install
        src/external/ibm-public/postfix/dist/html: TLS_README.html
            postconf.5.html
        src/external/ibm-public/postfix/dist/man/man5: postconf.5
        src/external/ibm-public/postfix/dist/proto: postconf.proto

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/dist/postfix-install
cvs rdiff -u -r1.4 -r1.5 \
    src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.7 -r1.8 \
    src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.7 -r1.8 \
    src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.7 -r1.8 \
    src/external/ibm-public/postfix/dist/proto/postconf.proto

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.