Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Sat, 6 Mar 2010 23:42:40 +0000 (00:42 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 6 Mar 2010 23:42:40 +0000 (00:42 +0100)
commit692382b031feb12242cbd59f5d7da7a95724b543
treeaf38794e2f4f48bb3406349be9499f7860b08c9d
parent84172cd0bdd4c86bfe3ce6b6617e779d654ab282
parentf2077d3c372ae356c1231c6ac195ee2a0142437d
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

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