Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Tue, 11 Aug 2009 10:25:55 +0000 (12:25 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 11 Aug 2009 10:25:55 +0000 (12:25 +0200)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  wolkenstein

1  2 
config/nagios-master.cfg

Simple merge