]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Mon, 28 Nov 2011 12:36:47 +0000 (13:36 +0100)
committerPeter Palfrader <peter@palfrader.org>
Mon, 28 Nov 2011 12:36:47 +0000 (13:36 +0100)
* '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


Trivial merge