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

Modified Files:
	src/gnu/dist/postfix/src/smtp: smtp_addr.c smtp_connect.c

Log Message:
Resolve conflicts.

To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/smtp/smtp_addr.c
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/src/smtp/smtp_unalias.c

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