Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  temporary hack to allow mail to rt-3520
  use submission port for zappa
  make zappa a buildd for puppet purposes
  template within template?  better not
  set edns buffer size to 512 on zappa
  Add zappa
  ignore dpkg on grieg
  Add blavet

diff --git a/modules/exim/files/common/blacklist b/modules/exim/files/common/blacklist
index e6b3e2e..6c5ad7b 100644 (file)
--- a/modules/exim/files/common/blacklist
+++ b/modules/exim/files/common/blacklist
@@ -8,4 +8,5 @@ mailadmin@o2online.de
 *@piekmarketing.eu
 stephetdadou@free.fr
 adwordsguru1@yahoo.co.uk
+adwordsmarketingcourse1@yahoo.co.uk
 mailmag@mag2.com