projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a18b39 35ee182)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Fri, 9 Dec 2011 08:11:26 +0000 (09:11 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Fri, 9 Dec 2011 08:11:26 +0000 (09:11 +0100)
commit6a74fcd797fb66c3fba4208a284e5c0f1be252b7
tree9acf8c00f26cd6cff75d9e50e7090d386827343ctree | snapshot
parent1a18b394bd4661e2abf68adedb41f5d760830bc2commit | diff
parent35ee182b0e3cc63242ee4050ed0cd7554e23cc77commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.