From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 20 Apr 2013 13:13:03 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=919f094764925064a0affdf8df08697ae016c4eb

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
---

919f094764925064a0affdf8df08697ae016c4eb