Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Mon, 9 Nov 2009 21:58:32 +0000 (22:58 +0100)
committerPeter Palfrader <peter@palfrader.org>
Mon, 9 Nov 2009 21:58:32 +0000 (22:58 +0100)
commite04c1899083df9b3ca97ae5b3e02830f16ea5307
tree6cbee6ccdaa34bca97d3cac1b0321be816477109
parent50cf01737945980092b85e5e77a5a26c418bbe92
parent3b28234eebf7c5240ffd40882561efecc536715b
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  duarte has one cpu for now
config/nagios-master.cfg