Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Fri, 22 Jan 2010 10:05:38 +0000 (11:05 +0100)
committerPeter Palfrader <peter@palfrader.org>
Fri, 22 Jan 2010 10:05:38 +0000 (11:05 +0100)
commit306305c3edb2e6e7fce4764c927982da905454ca
treed2d715655a3e97114ada792e1deaa8ad1e84a763
parent17233769de3cdab224f4e703d5f5dbf71247ac6b
parent9f7c90a1d4f618e02282dc009b595596b943daa4
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:
  fix munin check type
  try a different variable name
  bad variable name