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

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

Module Name:    src
Committed By:   tron
Date:           Sat Jan 24 18:10:52 UTC 2015

Modified Files:
        src/external/ibm-public/postfix/dist: makedefs
        src/external/ibm-public/postfix/dist/src/cleanup: cleanup.h
        src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.6 -r1.7 \
    src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
cvs rdiff -u -r1.11 -r1.12 \
    src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c

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