Merge branch 'mdw/relayhosts'
authorMark Wooding <mdw@distorted.org.uk>
Tue, 14 Feb 2006 02:52:33 +0000 (02:52 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 14 Feb 2006 02:52:33 +0000 (02:52 +0000)
* mdw/relayhosts:
  qmail-smtpd: Read list of hosts allowed to relay from control/relayhosts

Conflicts:

qmail-control.9
qmail-showctl.c
qmail-smtpd.c


No differences found