Module Name: src Committed By: tron Date: Fri Oct 28 07:12:17 UTC 2011
Modified Files:
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.6 -r1.7 \
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.
