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

Simple merge