Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Wed, 22 Jul 2009 08:44:03 +0000 (10:44 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 22 Jul 2009 08:44:03 +0000 (10:44 +0200)
commit84fd374ba2c5f26389cc4bbcdb3c56e5ee738a58
tree740eddd21ba685a1fd10488dee75706d1d6a1d05
parentd8fd3df3e08672e5eb6f55ca6a4eeae9657a29d2
parent223e29b4e0878cbc757d5e4d75eb58f7a41c5de1
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  update nagios for puppet in cron
config/nagios-master.cfg