From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 9 Dec 2011 08:11:26 +0000 (+0100)
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/?a=commitdiff_plain;h=6a74fcd797fb66c3fba4208a284e5c0f1be252b7;p=mirror%2Fdsa-puppet.git

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

6a74fcd797fb66c3fba4208a284e5c0f1be252b7