From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 14 Feb 2006 02:52:33 +0000 (+0000)
Subject: Merge branch 'mdw/relayhosts'
X-Git-Tag: mdw/1.03-2~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/qmail/commitdiff_plain/9f4f78697c369f41c86149f8ca24f8d298fc1c9f?hp=9f4f78697c369f41c86149f8ca24f8d298fc1c9f

Merge branch 'mdw/relayhosts'

* mdw/relayhosts:
  qmail-smtpd: Read list of hosts allowed to relay from control/relayhosts

Conflicts:

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