Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Wed, 16 Dec 2009 14:21:24 +0000 (15:21 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 16 Dec 2009 14:21:24 +0000 (15:21 +0100)
1  2 
config/nagios-master.cfg

Simple merge