Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Tue, 21 Apr 2009 16:07:59 +0000 (18:07 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 21 Apr 2009 16:07:59 +0000 (18:07 +0200)
1  2 
config/nagios-master.cfg

Simple merge