Subject: CVS commit: src/gnu/dist/postfix/src/smtpd
To: None <>
From: Rui Paulo <>
List: source-changes
Date: 08/18/2005 22:08:21
Module Name:	src
Committed By:	rpaulo
Date:		Thu Aug 18 22:08:21 UTC 2005

Modified Files:
	src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_check.c smtpd_peer.c

Log Message:
Resolve conflicts.

To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/src/smtpd/smtpd.c \
cvs rdiff -r1.16 -r1.17 src/gnu/dist/postfix/src/smtpd/smtpd_check.c

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