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

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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  secure 29.172.in-addr.arpa
  By default unbound answers queries for ASN112 networks on its own.  Teach it to behave.
  Forward reverse lookups to our nameservers
  s/org/srv/
  pick up some other useful rules
  this should make picconi handle mail
  1&1 cleanup
  \%, not %%
  qa-core sudo to qa-web-rolex
  %%, not %&
  Use %%, not % in cron.d file