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

Modified Files:
	src/gnu/dist/postfix/src/master: master.h master_ent.c master_listen.c

Log Message:
Resolve conflicts.

To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/master/master.h \
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/src/master/master_ent.c

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