Module Name: src Committed By: tron Date: Sat Feb 21 12:00:49 UTC 2015
Modified Files:
src/external/ibm-public/postfix/dist/src/postconf: postconf_master.c
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/src/postconf/postconf_master.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
