Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/exim-config
authorMark Wooding <mdw@distorted.org.uk>
Sat, 20 Dec 2014 13:40:23 +0000 (13:40 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 20 Dec 2014 13:40:23 +0000 (13:40 +0000)
* 'master' of git.distorted.org.uk:~mdw/publish/public-git/exim-config:
  base.m4: New `senders' entry in `domains.conf'.
  base.m4: Missing subsection name.
  spam.m4: No, we can't check domains in the DATA ACL.
  spam.m4: Allow virtual domains to opt out of spam checking.

1  2 
base.m4

diff --cc base.m4
Simple merge