From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 28 Nov 2011 12:36:47 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=29f0aa8acfc0b2ecdb414235a89c3d258964948e;p=mirror%2Fdsa-puppet.git

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

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Add blavet
  add czerny Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  add baidu spider to throttle list
---

29f0aa8acfc0b2ecdb414235a89c3d258964948e