From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 26 Aug 2009 09:50:50 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f9c4671764a79754a256a7d89989f46f686fe4cd;p=dsa-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:
  Ignore /etc/apache2/conf.d/ressource-limits
  set apache ressource limits (RT#1481)
  more hosts use default buildd software
  lebrun becomes standard buildd
---

f9c4671764a79754a256a7d89989f46f686fe4cd